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

Diff Legend

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