ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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