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.283 by root, Mon Jun 5 02:28:30 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;
1541}
1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1137} 1548}
1138 1549
1139sub set_text { 1550sub set_text {
1140 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1141 1552
1553 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text";
1555
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1143
1144 delete $self->{texture}; 1558 delete $self->{req_h};
1145 $self->check_size; 1559
1560 $self->realloc;
1146 $self->update; 1561 $self->update;
1147} 1562}
1148 1563
1149sub set_markup { 1564sub set_markup {
1150 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1151 1566
1567 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup";
1569
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1153
1154 delete $self->{texture}; 1574 delete $self->{req_h};
1155 $self->check_size; 1575
1576 $self->realloc;
1156 $self->update; 1577 $self->update;
1157} 1578}
1158 1579
1159sub size_request { 1580sub size_request {
1160 my ($self) = @_; 1581 my ($self) = @_;
1161 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1591
1166 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1167 1593
1168 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1169 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1170 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1171 1597
1172 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1173 1599
1174 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1175 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1176 } 1602 }
1177 1603
1604 ($w, $h)
1178 ( 1605 }
1179 $w + $self->{padding} * 2,
1180 $h + $self->{padding} * 2,
1181 )
1182} 1606}
1183 1607
1184sub size_allocate { 1608sub size_allocate {
1185 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1186 1610
1611 delete $self->{ox};
1612
1187 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1188} 1615}
1189 1616
1190sub set_fontsize { 1617sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1192 1619
1193 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1621 delete $self->{texture};
1195 $self->check_size; 1622
1196 $self->update; 1623 $self->realloc;
1197} 1624}
1198 1625
1199sub _draw { 1626sub _draw {
1200 my ($self) = @_; 1627 my ($self) = @_;
1201 1628
1629 $self->SUPER::_draw; # draw background, if applicable
1630
1202 my $tex = $self->{texture} ||= do { 1631 my $tex = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1633 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638
1206 new_from_layout CFClient::Texture $self->{layout} 1639 new_from_layout CFClient::Texture $self->{layout}
1207 }; 1640 };
1208 1641
1209 glEnable GL_BLEND; 1642 unless (exists $self->{ox}) {
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5);
1646
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5);
1650 };
1651
1211 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1654
1214 glColor @{$self->{fg}}; 1655 glColor_premultiply @{$self->{fg}}
1656 if $tex->{format} == GL_ALPHA;
1215 1657
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}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1229 1659
1230 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1661}
1233 1662
1234############################################################################# 1663#############################################################################
1235 1664
1236package CFClient::UI::EntryBase; 1665package CFClient::UI::EntryBase;
… …
1241 1670
1242sub new { 1671sub new {
1243 my $class = shift; 1672 my $class = shift;
1244 1673
1245 $class->SUPER::new ( 1674 $class->SUPER::new (
1246 fg => [1, 1, 1], 1675 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1676 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1677 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1250 can_hover => 1, 1679 can_hover => 1,
1251 can_focus => 1, 1680 can_focus => 1,
1252 valign => 0, 1681 valign => 0,
1253 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1254 @_ 1684 @_
1255 ) 1685 )
1256} 1686}
1257 1687
1258sub _set_text { 1688sub _set_text {
… …
1260 1690
1261 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1262 1692
1263 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1264 1694
1265 delete $self->{texture};
1266
1267 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1268 $self->{text} = $text; 1696 $self->{text} = $text;
1269 1697
1270 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1272 1701
1273 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1706}
1707
1708sub set_text {
1709 my ($self, $text) = @_;
1710
1711 $self->{cursor} = length $text;
1712 $self->_set_text ($text);
1274} 1713}
1275 1714
1276sub get_text { 1715sub get_text {
1277 $_[0]{text} 1716 $_[0]{text}
1278} 1717}
… …
1281 my ($self) = @_; 1720 my ($self) = @_;
1282 1721
1283 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1284 1723
1285 ($w + 1, $h) # add 1 for cursor 1724 ($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} 1725}
1301 1726
1302sub key_down { 1727sub key_down {
1303 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1304 1729
… …
1306 my $sym = $ev->{sym}; 1731 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1732 my $uni = $ev->{unicode};
1308 1733
1309 my $text = $self->get_text; 1734 my $text = $self->get_text;
1310 1735
1311 if ($sym == 8) { 1736 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1738 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1739 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1740 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1741 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1742 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1743 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1748 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1749 $self->_emit ('escape');
1325 } elsif ($uni) { 1750 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1327 } 1754 }
1328 1755
1329 $self->_set_text ($text); 1756 $self->_set_text ($text);
1330 $self->update; 1757
1758 $self->realloc;
1759
1760 1
1331} 1761}
1332 1762
1333sub focus_in { 1763sub focus_in {
1334 my ($self) = @_; 1764 my ($self) = @_;
1335 1765
… …
1350 utf8::encode $text; 1780 utf8::encode $text;
1351 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1352 1782
1353 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1354 $self->update; 1784 $self->update;
1785
1786 1
1355} 1787}
1356 1788
1357sub mouse_motion { 1789sub mouse_motion {
1358 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1359# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1360} 1794}
1361 1795
1362sub _draw { 1796sub _draw {
1363 my ($self) = @_; 1797 my ($self) = @_;
1364 1798
1365 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1366 1800
1367 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1368 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1369 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1370 } else { 1804 } else {
1371 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1372 } 1806 }
1373 1807
1374 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1375 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1376 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1377 glVertex 0 , 0; 1811 glVertex 0 , 0;
1378 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1379 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1380 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1411 my ($self, $ev) = @_; 1845 my ($self, $ev) = @_;
1412 1846
1413 my $sym = $ev->{sym}; 1847 my $sym = $ev->{sym};
1414 1848
1415 if ($sym == 13) { 1849 if ($sym == 13) {
1850 unshift @{$self->{history}},
1851 my $txt = $self->get_text;
1852 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1854 $self->_emit (activate => $txt);
1417 $self->update; 1855 $self->update;
1418 1856
1857 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text;
1860 }
1861 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++;
1863 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1864 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 }
1868
1869 } elsif ($sym == CFClient::SDLK_DOWN) {
1870 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872
1873 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else {
1876 $self->set_text ($self->{history_saveback});
1877 }
1878
1419 } else { 1879 } else {
1420 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1421 } 1883 1
1422
1423} 1884}
1424 1885
1425############################################################################# 1886#############################################################################
1426 1887
1427package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1436 1897
1437sub new { 1898sub new {
1438 my $class = shift; 1899 my $class = shift;
1439 1900
1440 $class->SUPER::new ( 1901 $class->SUPER::new (
1441 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1442 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1445 can_hover => 1, 1906 can_hover => 1,
1446 align => 0, 1907 align => 0,
1447 valign => 0, 1908 valign => 0,
1448 can_events => 1, 1909 can_events => 1,
1449 @_ 1910 @_
1450 ) 1911 )
1451} 1912}
1452 1913
1914sub activate { }
1915
1453sub button_up { 1916sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1455 1918
1919 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate"); 1922
1459 } 1923 1
1460} 1924}
1461 1925
1462sub _draw { 1926sub _draw {
1463 my ($self) = @_; 1927 my ($self) = @_;
1464 1928
1465 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1466 1930
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; 1931 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1476 1934
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1936
1479 glDisable GL_TEXTURE_2D; 1937 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1938
1482 $self->SUPER::_draw; 1939 $self->SUPER::_draw;
1483} 1940}
1484 1941
1485############################################################################# 1942#############################################################################
… …
1496 1953
1497sub new { 1954sub new {
1498 my $class = shift; 1955 my $class = shift;
1499 1956
1500 $class->SUPER::new ( 1957 $class->SUPER::new (
1501 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1502 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1962 bg => [0, 0, 0, 0.2],
1963 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1964 state => 0,
1505 can_hover => 1, 1965 can_hover => 1,
1506 @_ 1966 @_
1507 ) 1967 )
1508} 1968}
1509 1969
1510sub size_request { 1970sub size_request {
1511 my ($self) = @_; 1971 my ($self) = @_;
1512 1972
1513 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1514} 1974}
1515 1975
1516sub button_down { 1976sub button_down {
1517 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1518 1978
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1521 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1523 } 1987 1
1524} 1988}
1525 1989
1526sub _draw { 1990sub _draw {
1527 my ($self) = @_; 1991 my ($self) = @_;
1528 1992
1529 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1530 1994
1531 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1532 1996
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1534 2000
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 2002
1537 glEnable GL_BLEND; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
2004
1538 glEnable GL_TEXTURE_2D; 2005 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); 2006 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 2007 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 2008}
1548 2009
1549############################################################################# 2010#############################################################################
1550 2011
1551package CFClient::UI::Image; 2012package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 2055 glTranslate 0, -$self->{w}, 0;
1595 2056
1596 ($w, $h) = ($h, $w); 2057 ($w, $h) = ($h, $w);
1597 } 2058 }
1598 2059
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 2060 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 2062
1604 $tex->draw_quad (0, 0, $w, $h); 2063 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 2064
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 2065 glDisable GL_TEXTURE_2D;
1608} 2066}
1609 2067
1610############################################################################# 2068#############################################################################
1611 2069
… …
1659} 2117}
1660 2118
1661sub set_max { 2119sub set_max {
1662 my ($self, $max) = @_; 2120 my ($self, $max) = @_;
1663 2121
2122 return if $self->{max_val} == $max;
2123
1664 $self->{max_val} = $max; 2124 $self->{max_val} = $max;
2125 $self->update;
1665} 2126}
1666 2127
1667sub set_value { 2128sub set_value {
1668 my ($self, $val, $max) = @_; 2129 my ($self, $val, $max) = @_;
1669 2130
1670 $self->set_max ($max) 2131 $self->set_max ($max)
1671 if defined $max; 2132 if defined $max;
1672 2133
1673 $max = $self->{max_val}; 2134 return if $self->{val} == $val;
2135
1674 $self->{val} = $val; 2136 $self->{val} = $val;
1675
1676 $self->update; 2137 $self->update;
1677} 2138}
1678 2139
1679sub _draw { 2140sub _draw {
1680 my ($self) = @_; 2141 my ($self) = @_;
… …
1698 2159
1699 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1700 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1701 2162
1702 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 2168
1707 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1708 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
1743 2205
1744sub new { 2206sub new {
1745 my ($class, %arg) = @_; 2207 my ($class, %arg) = @_;
1746 2208
1747 my $self = $class->SUPER::new ( 2209 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2210 tooltip => $arg{type},
2211 can_hover => 1,
2212 can_events => 1,
1749 %arg, 2213 %arg,
1750 ); 2214 );
1751 2215
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2216 $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); 2217 $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); 2218 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2219
1756 $self 2220 $self
1757} 2221}
1758 2222
1759sub set_fontsize { 2223sub set_fontsize {
… …
1761 2225
1762 $self->{value}->set_fontsize ($fsize); 2226 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2227 $self->{max} ->set_fontsize ($fsize);
1764} 2228}
1765 2229
2230sub set_max {
2231 my ($self, $max) = @_;
2232
2233 $self->{gauge}->set_max ($max);
2234 $self->{max}->set_text ($max);
2235}
2236
1766sub set_value { 2237sub set_value {
1767 my ($self, $val, $max) = @_; 2238 my ($self, $val, $max) = @_;
1768 2239
1769 $self->set_max ($max) 2240 $self->set_max ($max)
1770 if defined $max; 2241 if defined $max;
1771 2242
1772 $self->{gauge}->set_value ($val, $max); 2243 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2244 $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} 2245}
1782 2246
1783############################################################################# 2247#############################################################################
1784 2248
1785package CFClient::UI::Slider; 2249package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2259 qw(s1_slider.png s1_slider_bg.png);
1796 2260
1797sub new { 2261sub new {
1798 my $class = shift; 2262 my $class = shift;
1799 2263
1800 # range [value, low, high, page] 2264 # range [value, low, high, page, unit]
1801 2265
1802 # TODO: 0-width page 2266 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2267 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2268 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2272 bg => [0, 0, 0, 0.2],
2273 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2275 min_w => $::WIDTH / 80,
1810 req_h => 20, 2276 min_h => $::WIDTH / 80,
1811 vertical => 0, 2277 vertical => 0,
1812 can_hover => 1, 2278 can_hover => 1,
1813 inner_pad => 5, 2279 inner_pad => 0.02,
1814 @_ 2280 @_
1815 ); 2281 );
1816 2282
2283 $self->set_value ($self->{range}[0]);
2284 $self->update;
2285
1817 $self 2286 $self
1818} 2287}
1819 2288
2289sub changed { }
2290
2291sub set_range {
2292 my ($self, $range) = @_;
2293
2294 ($range, $self->{range}) = ($self->{range}, $range);
2295
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2298}
2299
2300sub set_value {
2301 my ($self, $value) = @_;
2302
2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2304
2305 $hi = $lo + 1 if $hi <= $lo;
2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2309 $value = $lo if $value < $lo;
2310 $value = $hi - $page if $value > $hi - $page;
2311
2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2313 if $unit;
2314
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316
2317 if ($value != $old_value) {
2318 $self->_emit (changed => $value);
2319 $self->update;
2320 }
2321}
2322
1820sub size_request { 2323sub size_request {
1821 my ($self) = @_; 2324 my ($self) = @_;
1822 2325
1823 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
1824 my $h = $self->{req_h};
1825
1826 $self->{vertical} ? ($h, $w) : ($w, $h)
1827} 2327}
1828 2328
1829sub button_down { 2329sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
1831 2331
1832 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2333
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335
1833 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
1834} 2337}
1835 2338
1836sub mouse_motion { 2339sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
1838 2341
1839 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344
2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2346
2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2348
2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2354 1
2355}
2356
2357sub update {
2358 my ($self) = @_;
2359
2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2368 $self->set_value ($self->{range}[0]);
2369
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
1841 2372
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2374
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2375 $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 2376 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2377
1847 $x -= $inner_pad_px; # substract the padding 2378 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2379 $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 2380
1853 $self->emit (changed => $x); 2381 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2382 $self->{knob_w} = $knob_w;
1855 } 2383 }
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 2384
1869 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
1870 2386
1871 my ($w, $h) = @$self{qw(w h)}; 2387 glScale $self->{w}, $self->{h};
1872 2388
1873 if ($self->{vertical}) { 2389 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2390 # draw a vertical slider like a rotated horizontal slider
1875 2391
2392 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2393 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2394 }
1881 2395
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2396 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2397 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2398
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; 2399 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2401
1908 # draw background 2402 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2403 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2404
1911 # draw handle 2405 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2406 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2407
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
1916} 2409}
2410
2411#############################################################################
2412
2413package CFClient::UI::ValSlider;
2414
2415our @ISA = CFClient::UI::HBox::;
2416
2417sub new {
2418 my ($class, %arg) = @_;
2419
2420 my $range = delete $arg{range};
2421
2422 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift },
2426 from_value => sub { shift },
2427 %arg,
2428 );
2429
2430 $self->{slider}->connect (changed => sub {
2431 my ($self, $value) = @_;
2432 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2433 $self->{parent}->emit (changed => $value);
2434 });
2435
2436# $self->{entry}->connect (changed => sub {
2437# my ($self, $value) = @_;
2438# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2439# $self->{parent}->emit (changed => $value);
2440# });
2441
2442 $self->add ($self->{slider}, $self->{entry});
2443
2444 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2445
2446 $self
2447}
2448
2449sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) }
1917 2451
1918############################################################################# 2452#############################################################################
1919 2453
1920package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
1921 2455
… …
1925 2459
1926sub new { 2460sub new {
1927 my $class = shift; 2461 my $class = shift;
1928 2462
1929 my $self = $class->SUPER::new ( 2463 my $self = $class->SUPER::new (
1930 fontsize => 1, 2464 fontsize => 1,
2465 can_events => 0,
1931 #font => default_font 2466 #font => default_font
1932 @_, 2467 @_,
1933 2468
1934 layout => (new CFClient::Layout), 2469 layout => (new CFClient::Layout 1),
1935 par => [], 2470 par => [],
1936 height => 0, 2471 height => 0,
1937 children => [ 2472 children => [
1938 (new CFClient::UI::Empty expand => 1), 2473 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2474 (new CFClient::UI::Slider vertical => 1),
1940 ], 2475 ],
1941 ); 2476 );
1942 2477
1943 $self->{children}[1]->connect (changed => sub { 2478 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2479
1947 $self 2480 $self
1948} 2481}
1949 2482
1950sub set_fontsize { 2483sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2484 my ($self, $fontsize) = @_;
1952 2485
1953 $self->{fontsize} = $fontsize; 2486 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2487 $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} 2488}
1975 2489
1976sub size_allocate { 2490sub size_allocate {
1977 my ($self, $w, $h) = @_; 2491 my ($self, $w, $h) = @_;
1978 2492
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2498
1985 $self->reflow; 2499 $self->reflow;
1986} 2500}
1987 2501
2502sub text_size {
2503 my ($self, $text, $indent) = @_;
2504
2505 my $layout = $self->{layout};
2506
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2509 $layout->set_markup ($text);
2510
2511 $layout->size
2512}
2513
2514sub reflow {
2515 my ($self) = @_;
2516
2517 $self->{need_reflow}++;
2518 $self->update;
2519}
2520
2521sub set_offset {
2522 my ($self, $offset) = @_;
2523
2524 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset);
2526}
2527
2528sub clear {
2529 my ($self) = @_;
2530
2531 $self->{par} = [];
2532 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534}
2535
1988sub add_paragraph { 2536sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2537 my ($self, $color, $text, $indent) = @_;
1990 2538
1991 #TODO: intelligently "reformat" paragraph 2539 for my $line (split /\n/, $text) {
1992 2540 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2541 $self->{height} += $h;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2543 }
1996 2544
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2546}
2002 2547
2003sub update { 2548sub update {
2004 my ($self) = @_; 2549 my ($self) = @_;
2005 2550
… …
2007 2552
2008 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2009 2554
2010 delete $self->{texture}; 2555 delete $self->{texture};
2011 2556
2012 $ROOT->on_refresh ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2013 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2561 my $height = 0;
2015 2562
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2017 for @{$self->{par}}; 2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2018 2578
2019 $self->{height} = $height; 2579 $self->{height} = $height;
2020 2580
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2582
2023 delete $self->{texture}; 2583 delete $self->{texture};
2024 } 2584 }
2025 2585
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2587 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2029 2589
2590 my $top = int $self->{children}[1]{range}[0];
2591
2592 my $y0 = $top;
2593 my $y1 = $top + $H;
2594
2595 my $y = 0;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2030 glEnable GL_BLEND; 2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2603 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 2604
2046 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2606 my $h = $par->[1];
2048 2607
2049 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2611 $layout->set_markup ($par->[4]);
2051 2612
2052 glColor @{ $par->[1] }; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2614
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2615 glRasterPos $par->[3], $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2617 }
2056 2618
2057 $y += $h; 2619 $y += $h;
2058 } 2620 }
2059 2621
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2622 glDisable GL_BLEND;
2062 }; 2623 };
2063 }); 2624 });
2064} 2625}
2065 2626
2066sub _draw { 2627sub _draw {
2067 my ($self) = @_; 2628 my ($self) = @_;
2068 2629
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2632 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2074 }
2075 2635
2076 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2077 2637
2078} 2638}
2079 2639
… …
2127 2687
2128sub new { 2688sub new {
2129 my $class = shift; 2689 my $class = shift;
2130 2690
2131 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2132 state => 0, 2692 state => 0,
2133 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2694 @_
2136 ); 2695 );
2137 2696
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2697 $self
2144} 2698}
2145 2699
2146sub toggle_flopper { 2700sub toggle_flopper {
2147 my ($self) = @_; 2701 my ($self) = @_;
2148 2702
2149 # TODO: use animation 2703 $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} 2704}
2161 2705
2162############################################################################# 2706#############################################################################
2163 2707
2164package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2174 @_, 2718 @_,
2175 can_events => 0, 2719 can_events => 0,
2176 ) 2720 )
2177} 2721}
2178 2722
2179sub set_text { 2723sub set_tooltip_from {
2180 my ($self, $text) = @_; 2724 my ($self, $widget) = @_;
2181 2725
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2726 my $tooltip = $widget->{tooltip};
2183 $self->{label}->set_text ($text); 2727
2184 $self->add ($self->{label}); 2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2735 $self->add (new CFClient::UI::Label
2736 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8,
2739 fg => [0, 0, 0, 1],
2740 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 );
2185} 2743}
2186 2744
2187sub size_request { 2745sub size_request {
2188 my ($self) = @_; 2746 my ($self) = @_;
2189 2747
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2749
2194 ($w + 4, $h + 4) 2750 ($w + 4, $h + 4)
2195} 2751}
2196 2752
2753sub size_allocate {
2754 my ($self, $w, $h) = @_;
2755
2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2775}
2776
2197sub _draw { 2777sub _draw {
2198 my ($self) = @_; 2778 my ($self) = @_;
2199 2779
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2780 glTranslate 0.375, 0.375;
2202 2781
2203 my ($w, $h) = @$self{qw(w h)}; 2782 my ($w, $h) = @$self{qw(w h)};
2204 2783
2205 glColor 1, 0.8, 0.4; 2784 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2795 glVertex 0 , $h;
2217 glVertex $w, $h; 2796 glVertex $w, $h;
2218 glVertex $w, 0; 2797 glVertex $w, 0;
2219 glEnd; 2798 glEnd;
2220 2799
2221 glPopMatrix; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2222 2801
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2225} 2803}
2226 2804
2227############################################################################# 2805#############################################################################
2228 2806
2807package CFClient::UI::Face;
2808
2809our @ISA = CFClient::UI::Base::;
2810
2811use CFClient::OpenGL;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 aspect => 1,
2818 can_events => 0,
2819 @_,
2820 );
2821
2822 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self);
2824
2825 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1,
2828 interval => $self->{animspeed},
2829 cb => sub {
2830 ++$widget->{frame};
2831 $widget->update;
2832 },
2833 );
2834 }
2835
2836 $self
2837}
2838
2839sub size_request {
2840 (32, 8)
2841}
2842
2843sub update {
2844 my ($self) = @_;
2845
2846 return unless $self->{visible};
2847
2848 $self->SUPER::update;
2849}
2850
2851sub _draw {
2852 my ($self) = @_;
2853
2854 return unless $::CONN;
2855
2856 my $face;
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2866
2867 if ($tex) {
2868 glEnable GL_TEXTURE_2D;
2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870 glColor 0, 0, 0, 1;
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D;
2873 }
2874}
2875
2876sub DESTROY {
2877 my ($self) = @_;
2878
2879 $self->{timer}->cancel
2880 if $self->{timer};
2881
2882 $self->SUPER::DESTROY;
2883}
2884
2885#############################################################################
2886
2887package CFClient::UI::Buttonbar;
2888
2889our @ISA = CFClient::UI::HBox::;
2890
2891# TODO: should actualyl wrap buttons and other goodies.
2892
2893#############################################################################
2894
2895package CFClient::UI::Menu;
2896
2897our @ISA = CFClient::UI::FancyFrame::;
2898
2899use CFClient::OpenGL;
2900
2901sub new {
2902 my $class = shift;
2903
2904 my $self = $class->SUPER::new (
2905 items => [],
2906 z => 100,
2907 @_,
2908 );
2909
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911
2912 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item;
2914
2915 # handle various types of items, only text for now
2916 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label
2918 can_hover => 1,
2919 can_events => 1,
2920 text => $widget;
2921 }
2922
2923 $self->{item}{$widget} = $item;
2924
2925 $self->{vbox}->add ($widget);
2926 }
2927
2928 $self
2929}
2930
2931# popup given the event (must be a mouse button down event currently)
2932sub popup {
2933 my ($self, $ev) = @_;
2934
2935 $self->_emit ("popdown");
2936
2937 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self;
2939 $self->{button} = $ev->{button};
2940
2941 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943}
2944
2945sub mouse_motion {
2946 my ($self, $ev, $x, $y) = @_;
2947
2948 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2953}
2954
2955sub button_up {
2956 my ($self, $ev, $x, $y) = @_;
2957
2958 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB;
2960 $self->hide;
2961
2962 $self->_emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2968 1
2969}
2970
2971#############################################################################
2972
2973package CFClient::UI::Multiplexer;
2974
2975our @ISA = CFClient::UI::Container::;
2976
2977sub new {
2978 my $class = shift;
2979
2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
3089 fontsize => 0.8,
3090 @_,
3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
3098}
3099
3100sub reorder {
3101 my ($self) = @_;
3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
3108
3109 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 }
3112
3113 my @widgets;
3114
3115 my @items = sort {
3116 $a->{pri} <=> $b->{pri}
3117 or $b->{id} <=> $a->{id}
3118 } values %{ $self->{item} };
3119
3120 $self->{timer}->interval (1);
3121
3122 my $count = 10 + 1;
3123 for my $item (@items) {
3124 last unless --$count;
3125
3126 my $label = $item->{label} ||= do {
3127 # TODO: doesn't handle markup well (read as: at all)
3128 my $short = $item->{count} > 1
3129 ? "<b>$item->{count} ×</b> $item->{text}"
3130 : $item->{text};
3131
3132 for ($short) {
3133 s/^\s+//;
3134 s/\s+/ /g;
3135 }
3136
3137 new CFClient::UI::Label
3138 markup => $short,
3139 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize},
3143 max_w => $::WIDTH * 0.44,
3144 fg => [@{ $item->{fg} }],
3145 can_events => 1,
3146 can_hover => 1
3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
3160 }
3161
3162 $self->clear;
3163 $self->SUPER::add (reverse @widgets);
3164}
3165
3166sub add {
3167 my ($self, $text, %arg) = @_;
3168
3169 $text =~ s/^\s+//;
3170 $text =~ s/\s+$//;
3171
3172 return unless $text;
3173
3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3175
3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3177
3178 if (my $item = $self->{item}{$group}) {
3179 if ($item->{text} eq $text) {
3180 $item->{count}++;
3181 } else {
3182 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text;
3184 }
3185 $item->{id} = ++$self->{id};
3186 $item->{timeout} = $timeout;
3187 delete $item->{label};
3188 } else {
3189 $self->{item}{$group} = {
3190 id => ++$self->{id},
3191 text => $text,
3192 timeout => $timeout,
3193 tooltip => $text,
3194 fg => [0.8, 0.8, 0.8, 0.8],
3195 pri => 0,
3196 count => 1,
3197 %arg,
3198 };
3199 }
3200
3201 $self->reorder;
3202}
3203
3204sub reconfigure {
3205 my ($self) = @_;
3206
3207 delete $_->{label}
3208 for values %{ $self->{item} || {} };
3209
3210 $self->reorder;
3211 $self->SUPER::reconfigure;
3212}
3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3222#############################################################################
3223
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
2229package CFClient::UI::Root; 3519package CFClient::UI::Root;
2230 3520
2231our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
2232 3522
3523use List::Util qw(min max);
3524
2233use CFClient::OpenGL; 3525use CFClient::OpenGL;
2234 3526
2235sub check_size { 3527sub new {
2236 my ($self) = @_; 3528 my $class = shift;
2237 3529
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2239} 3538}
2240 3539
2241sub size_request { 3540sub size_request {
2242 ($::WIDTH, $::HEIGHT) 3541 my ($self) = @_;
2243}
2244 3542
2245sub configure { 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
3558}
3559
3560sub size_allocate {
2246 my ($self, $x, $y, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2247 3562
2248 $self->SUPER::configure ($x, $y, $w, $h);
2249
2250 for my $child (@{$self->{children}}) { 3563 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3565
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3566 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3568
3569 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h};
3571
2255 $child->configure ($X, $Y, $W,$H); 3572 $child->configure ($X, $Y, $W, $H);
2256 } 3573 }
2257} 3574}
2258 3575
2259sub _topleft { 3576sub coord2local {
2260 my ($self, $x, $y) = @_; 3577 my ($self, $x, $y) = @_;
2261 3578
2262 ($x, $y) 3579 ($x, $y)
2263} 3580}
2264 3581
3582sub coord2global {
3583 my ($self, $x, $y) = @_;
3584
3585 ($x, $y)
3586}
3587
2265sub update { 3588sub update {
2266 my ($self) = @_; 3589 my ($self) = @_;
2267 3590
2268 $self->check_size; 3591 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3592}
2271 3593
2272sub add { 3594sub add {
2273 my ($self, $child) = @_; 3595 my ($self, @children) = @_;
2274 3596
2275 # integerize window positions 3597 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3598 for @children;
2277 $child->{y} = int $child->{y};
2278 3599
2279 $self->SUPER::add ($child); 3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
2280} 3616}
2281 3617
2282sub on_refresh { 3618sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
2284 3620
2285 $self->{refresh_hook}{$id} = $cb; 3621 $self->{refresh_hook}{$id} = $cb;
2286} 3622}
2287 3623
3624sub on_post_alloc {
3625 my ($self, $id, $cb) = @_;
3626
3627 $self->{post_alloc_hook}{$id} = $cb;
3628}
3629
2288sub draw { 3630sub draw {
2289 my ($self) = @_; 3631 my ($self) = @_;
2290 3632
2291 while (my $rcb = delete $self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3634 $_->()
3635 for values %{delete $self->{refresh_hook}};
2293 } 3636 }
3637
3638 if ($self->{realloc}) {
3639 my %queue;
3640 my @queue;
3641 my $widget;
3642
3643 outer:
3644 while () {
3645 if (my $realloc = delete $self->{realloc}) {
3646 for $widget (values %$realloc) {
3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3653 }
3654
3655 while () {
3656 @queue or last outer;
3657
3658 $widget = pop @{ $queue[-1] || [] }
3659 and last;
3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3679 $widget->{req_w} = $w;
3680 $widget->{req_h} = $h;
3681
3682 $self->{size_alloc}{$widget+0} = $widget;
3683
3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3694 }
3695 }
3696
3697 while (my $size_alloc = delete $self->{size_alloc}) {
3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705
3706 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0;
3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3716 $widget->{w} = $w;
3717 $widget->{h} = $h;
3718
3719 $widget->emit (size_allocate => $w, $h);
3720 }
3721 }
3722 }
3723
3724 while ($self->{post_alloc_hook}) {
3725 $_->()
3726 for values %{delete $self->{post_alloc_hook}};
3727 }
3728
2294 3729
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
2298 3733
2299 glMatrixMode GL_PROJECTION; 3734 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3735 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3738 glLoadIdentity;
2304 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
2305 $self->_draw; 3747 $self->_draw;
2306} 3748}
2307 3749
2308############################################################################# 3750#############################################################################
2309 3751
2310package CFClient::UI; 3752package CFClient::UI;
2311 3753
2312$ROOT = new CFClient::UI::Root; 3754$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3755$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3756
23151 37571
2316 3758

Diff Legend

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