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.163 by root, Mon Apr 24 06:40:29 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 (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
241sub set_max_size { 383sub set_max_size {
242 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
243 385
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 388}
247 389
248# return top left coordinates 390sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
251 392
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
253} 404}
254 405
255# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
256sub coord2local { 407sub coord2local {
257 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
258 409
259 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 411}
262 412
263# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
264sub coord2global { 414sub coord2global {
265 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
266 416
267 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 418}
270 419
271sub focus_in { 420sub focus_in {
272 my ($self) = @_; 421 my ($self) = @_;
273 422
274 return if $FOCUS == $self; 423 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
276 425
277 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
278 427
279 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
280 429
281 $focus->update if $focus; 430 $focus->update if $focus;
282 $FOCUS->update; 431 $FOCUS->update;
283} 432}
284 433
… …
287 436
288 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
289 438
290 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
291 440
292 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
293 442
294 $focus->update if $focus; #? 443 $focus->update if $focus; #?
295}
296 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
297sub mouse_motion { } 449sub mouse_motion { 0 }
298sub button_up { } 450sub button_up { 0 }
299sub key_down { } 451sub key_down { 0 }
300sub key_up { } 452sub key_up { 0 }
301 453
302sub button_down { 454sub button_down {
303 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
304 456
305 $self->focus_in; 457 $self->focus_in;
306}
307 458
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
312sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
313 535
314sub draw { 536sub draw {
315 my ($self) = @_; 537 my ($self) = @_;
316 538
317 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
318 550
319 glPushMatrix; 551 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw;
322 glPopMatrix;
323 553
324 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
325 my ($x, $y) = @$self{qw(x y)};
326
327 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
328 glEnable GL_BLEND; 556 glEnable GL_BLEND;
329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
330 glBegin GL_QUADS; 558 glBegin GL_QUADS;
331 glVertex $x , $y;
332 glVertex $x + $self->{w}, $y;
333 glVertex $x + $self->{w}, $y + $self->{h};
334 glVertex $x , $y + $self->{h};
335 glEnd;
336 glDisable GL_BLEND;
337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 559 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
348 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
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;
349 glPopMatrix; 577 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
352} 583}
353 584
354sub _draw { 585sub _draw {
355 my ($self) = @_; 586 my ($self) = @_;
356 587
357 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
358} 589}
359 590
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 591sub DESTROY {
424 my ($self) = @_; 592 my ($self) = @_;
425 593
594 delete $WIDGET{$self+0};
426 #$self->deactivate; 595 #$self->deactivate;
427} 596}
428 597
429############################################################################# 598#############################################################################
430 599
… …
439 my $class = shift; 608 my $class = shift;
440 609
441 # range [value, low, high, page] 610 # range [value, low, high, page]
442 611
443 $class->SUPER::new ( 612 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
446 @_ 615 @_
447 ) 616 )
448} 617}
449 618
450sub _draw { 619sub _draw {
451 my ($self) = @_; 620 my ($self) = @_;
452 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
454 628
455 glEnable GL_BLEND; 629 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
458 632
459 glBegin GL_QUADS; 633 glBegin GL_QUADS;
460 glVertex 0 , 0; 634 glVertex 0 , 0;
461 glVertex 0 , $h; 635 glVertex 0 , $h;
462 glVertex $w, $h; 636 glVertex $w, $h;
463 glVertex $w, 0; 637 glVertex $w, 0;
464 glEnd; 638 glEnd;
465 639
466 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
467} 642}
468 643
469############################################################################# 644#############################################################################
470 645
471package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
478} 653}
479 654
480sub size_request { 655sub size_request {
481 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
482} 659}
483 660
484sub draw { } 661sub draw { }
485 662
486############################################################################# 663#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
491 668
492sub new { 669sub new {
493 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
494 671
495 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
496 673
497 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
498 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
499 682
500 $self 683 $self
501} 684}
502 685
503sub add { 686sub add {
504 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
505 688
506 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
507 691
508 use sort 'stable'; 692 use sort 'stable';
509 693
510 $self->{children} = [ 694 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
513 ]; 697 ];
514 698
515 $child->check_size; 699 $self->realloc;
700}
701
702sub children {
703 @{ $_[0]{children} }
516} 704}
517 705
518sub remove { 706sub remove {
519 my ($self, $child) = @_; 707 my ($self, $child) = @_;
520 708
521 delete $child->{parent}; 709 delete $child->{parent};
522 $child->hide; 710 $child->hide;
523 711
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 713
526 $self->check_size; 714 $self->realloc;
527 $self->update;
528} 715}
529 716
530sub clear { 717sub clear {
531 my ($self) = @_; 718 my ($self) = @_;
532 719
… …
535 722
536 for (@$children) { 723 for (@$children) {
537 delete $_->{parent}; 724 delete $_->{parent};
538 $_->hide; 725 $_->hide;
539 } 726 }
727
728 $self->realloc;
540} 729}
541 730
542sub find_widget { 731sub find_widget {
543 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
544 733
545 $x -= $self->{x}; 734 $x -= $self->{x};
546 $y -= $self->{y}; 735 $y -= $self->{y};
547 736
548 my $res; 737 my $res;
549 738
550 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
552 and return $res; 741 and return $res;
553 } 742 }
554 743
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
604 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
605} 794}
606 795
607############################################################################# 796#############################################################################
608 797
798# back-buffered drawing area
799
609package CFClient::UI::Window; 800package CFClient::UI::Window;
610 801
611our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
612 803
613use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
619} 810}
620 811
621sub update { 812sub update {
622 my ($self) = @_; 813 my ($self) = @_;
623 814
624 # we want to do this delayed... 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 816 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 817}
638 818
639sub size_allocate { 819sub size_allocate {
640 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
641 821
642 $self->child->configure (0, 0, $w, $h); 822 $self->SUPER::size_allocate ($w, $h);
823 $self->update;
824}
643 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
644 $self->render_chld; 846 $self->_render;
847 };
645} 848}
646 849
647sub _draw { 850sub _draw {
648 my ($self) = @_; 851 my ($self) = @_;
649 852
650 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
651 854
652 my $tex = $self->{texture} 855 my $tex = $self->{texture}
653 or return; 856 or return;
654 857
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
658 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;
659 863
660 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
661 865
662 glDisable GL_BLEND; 866 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
… …
667 871
668package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
669 873
670our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
671 875
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697
698sub new { 876sub new {
699 my $class = shift; 877 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 979 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 980 slider => $slider,
704 border => 0.8, 981 %arg,
705 @_
706 ); 982 );
707 983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
708 $self 987 $self
709} 988}
710 989
711sub _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 {
712 my ($self) = @_; 1007 my ($self, $w, $h) = @_;
713 1008
714 my ($w, $h) = ($self->{w}, $self->{h}); 1009 $self->SUPER::size_allocate ($w, $h);
715 1010
716 glEnable GL_BLEND; 1011 my $child = $self->{vp}->child;
717 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]);
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
734 1017
735############################################################################# 1018#############################################################################
736 1019
737package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
738 1021
739our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
740 1023
741use CFClient::OpenGL; 1024use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1025
747sub new { 1026sub new {
748 my $class = shift; 1027 my $class = shift;
749 1028
750 # 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};
751 1078
752 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1082 border => 0.6,
756 can_events => 1, 1083 can_events => 1,
757 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
758 ); 1087 );
759 1088
760 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
761 align => 0, 1090 align => 0,
762 valign => 1, 1091 valign => 1,
763 text => $self->{title}, 1092 text => $title,
764 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
765 1095
766 $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};
767} 1104}
768 1105
769sub border { 1106sub border {
770 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
771} 1108}
772 1109
773sub size_request { 1110sub size_request {
774 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
775 1115
776 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
777 1117
778 ( 1118 (
779 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
782} 1122}
783 1123
784sub size_allocate { 1124sub size_allocate {
785 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
786 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
787 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
789 1137
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
793 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
794} 1139}
795 1140
796sub button_down { 1141sub button_down {
797 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
798 1143
1144 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 1145 my $border = $self->border;
800 1146
801 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
806 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
807 $self->{motion} = sub { 1158 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
809 1160
810 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
811 1163
812 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
814 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
815 }; 1169 };
816 1170
817 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
822 1174
823 $self->{motion} = sub { 1175 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
825 1177
826 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
827 1179
828 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
829 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
830 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
831 } 1188 1
832} 1189}
833 1190
834sub button_up { 1191sub button_up {
835 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
836 1193
837 delete $self->{motion}; 1194 !!delete $self->{motion}
838} 1195}
839 1196
840sub mouse_motion { 1197sub mouse_motion {
841 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
842 1199
843 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
844} 1203}
845 1204
846sub _draw { 1205sub _draw {
847 my ($self) = @_; 1206 my ($self) = @_;
848 1207
1208 my $child = $self->{children}[0];
1209
849 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
851 1212
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 1215
857 my $border = $self->border; 1216 my $border = $self->border;
858 1217
859 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
864 1223
865 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
866 1226
867 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
869 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
870 1230 $bg->{t} = $ch / $bg->{h};
871 glColor @{ $self->{bg} };
872
873 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
877 1233
878 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1235
881 $self->{title}->draw if $self->{title};
882 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
883} 1242}
884 1243
885############################################################################# 1244#############################################################################
886 1245
887package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
895sub new { 1254sub new {
896 my $class = shift; 1255 my $class = shift;
897 1256
898 $class->SUPER::new ( 1257 $class->SUPER::new (
899 col_expand => [], 1258 col_expand => [],
900 @_ 1259 @_,
901 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
902} 1265}
903 1266
904sub add { 1267sub add {
905 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
906 1269
907 $child->set_parent ($self); 1270 $child->set_parent ($self);
908 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
909 1272
910 $child->check_size; 1273 $self->realloc;
911} 1274}
912 1275
913# 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?
914sub clear { 1277sub clear {
915 my ($self) = @_; 1278 my ($self) = @_;
916 1279
917 my $children = delete $self->{children}; 1280 my @children = $self->children;
1281 delete $self->{children};
918 1282
919 for (grep $_, map @$_, grep $_, @$children) { 1283 for (@children) {
920 delete $_->{parent}; 1284 delete $_->{parent};
921 $_->hide; 1285 $_->hide;
922 } 1286 }
923 1287
924 $self->update; 1288 $self->realloc;
925} 1289}
926 1290
927sub get_wh { 1291sub get_wh {
928 my ($self) = @_; 1292 my ($self) = @_;
929 1293
… …
960sub size_allocate { 1324sub size_allocate {
961 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
962 1326
963 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
964 1328
965 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
966 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
967 1331
968 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
969 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
970 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
971 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1025 } 1389 }
1026} 1390}
1027 1391
1028############################################################################# 1392#############################################################################
1029 1393
1030package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1031
1032# TODO: wrap into common Box base class
1033 1395
1034our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1035 1397
1036sub size_request { 1398sub size_request {
1037 my ($self) = @_; 1399 my ($self) = @_;
1038 1400
1039 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1040 1402 ? (
1041 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1042 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1043 (List::Util::max map $_->[1], @alloc), 1405 )
1044 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1045} 1410}
1046 1411
1047sub size_allocate { 1412sub size_allocate {
1048 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1049 1414
1050 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1051
1052 my $children = $self->{children}; 1416 my $children = $self->{children};
1053 1417
1054 my @h = map $_->{req_w}, @$children; 1418 my @req;
1055 1419
1056 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1057 1421 @req = ($space / (@$children || 1)) x @$children;
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } 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 {
1062 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1063 $exp ||= 1;
1064 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1065 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1066 my $child = $children->[$_];
1067
1068 my $alloc_h = $h[$_];
1069 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1070 $h[$_] = $alloc_h;
1071 } 1436 }
1072 } 1437 }
1073 1438
1074 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1075 1440
1076 my $y = 0; 1441 my $pos = 0;
1077 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1078 my $child = $children->[$_];
1079 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1080 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1081 1445
1082 $y += $h; 1446 $pos += $alloc;
1083 } 1447 }
1084 1448
1085 1 1449 1
1086} 1450}
1087 1451
1088############################################################################# 1452#############################################################################
1089 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
1090package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1091 1470
1092# TODO: wrap into common Box base class
1093
1094our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1095 1472
1096sub size_request { 1473sub new {
1097 my ($self) = @_; 1474 my $class = shift;
1098 1475
1099 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1100 1477 vertical => 1,
1101 ( 1478 @_,
1102 (List::Util::max map $_->[0], @alloc),
1103 (List::Util::sum map $_->[1], @alloc),
1104 ) 1479 )
1105} 1480}
1106 1481
1107sub size_allocate {
1108 my ($self, $w, $h) = @_;
1109
1110 my $children = $self->{children};
1111
1112 my @h = map $_->{req_h}, @$children;
1113
1114 my $req_h = List::Util::sum @h;
1115
1116 if ($req_h > $h) {
1117 # ah well, not enough space
1118 $_ *= $h / $req_h for @h;
1119 } else {
1120 my $exp = List::Util::sum map $_->{expand}, @$children;
1121 $exp ||= 1;
1122
1123 for (0 .. $#$children) {
1124 my $child = $children->[$_];
1125
1126 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1127 }
1128 }
1129
1130 CFClient::UI::harmonize \@h;
1131
1132 my $y = 0;
1133 for (0 .. $#$children) {
1134 my $child = $children->[$_];
1135 my $h = $h[$_];
1136 $child->configure (0, $y, $w, $h);
1137
1138 $y += $h;
1139 }
1140
1141 1
1142}
1143
1144############################################################################# 1482#############################################################################
1145 1483
1146package CFClient::UI::Label; 1484package CFClient::UI::Label;
1147 1485
1148our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1149 1487
1150use CFClient::OpenGL; 1488use CFClient::OpenGL;
1151 1489
1152sub new { 1490sub new {
1153 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1154 1492
1155 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1157 #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),
1158 fontsize => 1, 1503 fontsize => 1,
1159 text => "",
1160 align => -1, 1504 align => -1,
1161 valign => -1, 1505 valign => -1,
1162 padding => 2, 1506 padding_x => 2,
1163 layout => new CFClient::Layout, 1507 padding_y => 2,
1164 can_events => 0, 1508 can_events => 0,
1165 %arg 1509 %arg
1166 ); 1510 );
1167 1511
1168 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1515 $self->{template} = $layout;
1172 } 1516 }
1173 1517
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1175 $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 }
1176 1523
1177 $self 1524 $self
1178} 1525}
1179 1526
1180sub escape { 1527sub escape($) {
1181 local $_ = $_[1]; 1528 local $_ = $_[0];
1182 1529
1183 s/&/&amp;/g; 1530 s/&/&amp;/g;
1184 s/>/&gt;/g; 1531 s/>/&gt;/g;
1185 s/</&lt;/g; 1532 s/</&lt;/g;
1186 1533
1187 $_[1] 1534 $_
1535}
1536
1537sub update {
1538 my ($self) = @_;
1539
1540 delete $self->{texture};
1541 $self->SUPER::update;
1188} 1542}
1189 1543
1190sub set_text { 1544sub set_text {
1191 my ($self, $text) = @_; 1545 my ($self, $text) = @_;
1192 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;
1193 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1194 1552
1195 delete $self->{texture}; 1553 $self->realloc;
1196 $self->check_size;
1197 $self->update; 1554 $self->update;
1198} 1555}
1199 1556
1200sub set_markup { 1557sub set_markup {
1201 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1202 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;
1203 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1204 1567
1205 delete $self->{texture}; 1568 $self->realloc;
1206 $self->check_size;
1207 $self->update; 1569 $self->update;
1208} 1570}
1209 1571
1210sub size_request { 1572sub size_request {
1211 my ($self) = @_; 1573 my ($self) = @_;
1212 1574
1213 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1575 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $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});
1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216 1580
1217 my ($w, $h) = $self->{layout}->size; 1581 my ($w, $h) = $self->{layout}->size;
1218 1582
1219 if (exists $self->{template}) { 1583 if (exists $self->{template}) {
… …
1224 1588
1225 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1226 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1227 } 1591 }
1228 1592
1229 ( 1593 ($w, $h)
1230 $w + $self->{padding} * 2,
1231 $h + $self->{padding} * 2,
1232 )
1233} 1594}
1234 1595
1235sub size_allocate { 1596sub size_allocate {
1236 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1237 1598
1599 delete $self->{ox};
1600
1238 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1239} 1603}
1240 1604
1241sub set_fontsize { 1605sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1243 1607
1244 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1609 delete $self->{texture};
1246 $self->check_size; 1610
1247 $self->update; 1611 $self->realloc;
1248} 1612}
1249 1613
1250sub _draw { 1614sub _draw {
1251 my ($self) = @_; 1615 my ($self) = @_;
1252 1616
1617 $self->SUPER::_draw; # draw background, if applicable
1618
1253 my $tex = $self->{texture} ||= do { 1619 my $tex = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1621 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $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});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626
1257 new_from_layout CFClient::Texture $self->{layout} 1627 new_from_layout CFClient::Texture $self->{layout}
1258 }; 1628 };
1259 1629
1260 glEnable GL_BLEND; 1630 unless (exists $self->{ox}) {
1261 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
1262 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1642
1643 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1644 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $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 }
1280 1649
1281 glDisable GL_TEXTURE_2D; 1650 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1651}
1284 1652
1285############################################################################# 1653#############################################################################
1286 1654
1287package CFClient::UI::EntryBase; 1655package CFClient::UI::EntryBase;
… …
1292 1660
1293sub new { 1661sub new {
1294 my $class = shift; 1662 my $class = shift;
1295 1663
1296 $class->SUPER::new ( 1664 $class->SUPER::new (
1297 fg => [1, 1, 1], 1665 fg => [1, 1, 1],
1298 bg => [0, 0, 0, 0.2], 1666 bg => [0, 0, 0, 0.2],
1299 active_bg => [1, 1, 1, 0.5], 1667 active_bg => [1, 1, 1, 0.5],
1300 active_fg => [0, 0, 0], 1668 active_fg => [0, 0, 0],
1301 can_hover => 1, 1669 can_hover => 1,
1302 can_focus => 1, 1670 can_focus => 1,
1303 valign => 0, 1671 valign => 0,
1304 can_events => 1, 1672 can_events => 1,
1673 #text => ...
1305 @_ 1674 @_
1306 ) 1675 )
1307} 1676}
1308 1677
1309sub _set_text { 1678sub _set_text {
… …
1311 1680
1312 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1313 1682
1314 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1315 1684
1316 delete $self->{texture};
1317
1318 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1319 $self->{text} = $text; 1686 $self->{text} = $text;
1320 1687
1321 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1323 1690
1324 $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;
1325} 1702}
1326 1703
1327sub get_text { 1704sub get_text {
1328 $_[0]{text} 1705 $_[0]{text}
1329} 1706}
… …
1332 my ($self) = @_; 1709 my ($self) = @_;
1333 1710
1334 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1335 1712
1336 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1714}
1352 1715
1353sub key_down { 1716sub key_down {
1354 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1355 1718
… …
1357 my $sym = $ev->{sym}; 1720 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1721 my $uni = $ev->{unicode};
1359 1722
1360 my $text = $self->get_text; 1723 my $text = $self->get_text;
1361 1724
1362 if ($sym == 8) { 1725 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1727 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1728 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1729 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1730 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1731 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1732 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1737 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1738 $self->_emit ('escape');
1376 } elsif ($uni) { 1739 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1378 } 1743 }
1379 1744
1380 $self->_set_text ($text); 1745 $self->_set_text ($text);
1381 $self->update; 1746
1747 $self->realloc;
1748
1749 1
1382} 1750}
1383 1751
1384sub focus_in { 1752sub focus_in {
1385 my ($self) = @_; 1753 my ($self) = @_;
1386 1754
… …
1401 utf8::encode $text; 1769 utf8::encode $text;
1402 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1403 1771
1404 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1405 $self->update; 1773 $self->update;
1774
1775 1
1406} 1776}
1407 1777
1408sub mouse_motion { 1778sub mouse_motion {
1409 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1410# 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
1411} 1783}
1412 1784
1413sub _draw { 1785sub _draw {
1414 my ($self) = @_; 1786 my ($self) = @_;
1415 1787
1416 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1417 1789
1418 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1419 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1420 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1421 } else { 1793 } else {
1422 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1423 } 1795 }
1424 1796
1425 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1427 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1428 glVertex 0 , 0; 1800 glVertex 0 , 0;
1429 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1430 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1431 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1462 my ($self, $ev) = @_; 1834 my ($self, $ev) = @_;
1463 1835
1464 my $sym = $ev->{sym}; 1836 my $sym = $ev->{sym};
1465 1837
1466 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} = '';
1467 $self->emit (activate => $self->get_text); 1843 $self->_emit (activate => $txt);
1468 $self->update; 1844 $self->update;
1469 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
1470 } else { 1868 } else {
1471 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1472 } 1872 1
1473
1474} 1873}
1475 1874
1476############################################################################# 1875#############################################################################
1477 1876
1478package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1487 1886
1488sub new { 1887sub new {
1489 my $class = shift; 1888 my $class = shift;
1490 1889
1491 $class->SUPER::new ( 1890 $class->SUPER::new (
1492 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1493 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1496 can_hover => 1, 1895 can_hover => 1,
1497 align => 0, 1896 align => 0,
1498 valign => 0, 1897 valign => 0,
1499 can_events => 1, 1898 can_events => 1,
1500 @_ 1899 @_
1501 ) 1900 )
1502} 1901}
1503 1902
1903sub activate { }
1904
1504sub button_up { 1905sub button_up {
1505 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1506 1907
1908 $self->emit ("activate")
1507 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1508 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1509 $self->emit ("activate"); 1911
1510 } 1912 1
1511} 1913}
1512 1914
1513sub _draw { 1915sub _draw {
1514 my ($self) = @_; 1916 my ($self) = @_;
1515 1917
… …
1517 1919
1518 if ($GRAB == $self) { 1920 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1921 $self->{fg} = $self->{active_fg};
1520 } 1922 }
1521 1923
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1924 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1926 glColor 0, 0, 0, 1;
1527 1927
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1929
1530 glDisable GL_TEXTURE_2D; 1930 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1931
1533 $self->SUPER::_draw; 1932 $self->SUPER::_draw;
1534} 1933}
1535 1934
1536############################################################################# 1935#############################################################################
… …
1547 1946
1548sub new { 1947sub new {
1549 my $class = shift; 1948 my $class = shift;
1550 1949
1551 $class->SUPER::new ( 1950 $class->SUPER::new (
1552 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1553 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1554 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],
1555 state => 0, 1957 state => 0,
1556 can_hover => 1, 1958 can_hover => 1,
1557 @_ 1959 @_
1558 ) 1960 )
1559} 1961}
1560 1962
1561sub size_request { 1963sub size_request {
1562 my ($self) = @_; 1964 my ($self) = @_;
1563 1965
1564 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1565} 1967}
1566 1968
1567sub button_down { 1969sub button_down {
1568 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1569 1971
1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1572 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1573 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1574 } 1980 1
1575} 1981}
1576 1982
1577sub _draw { 1983sub _draw {
1578 my ($self) = @_; 1984 my ($self) = @_;
1579 1985
1580 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1581 1987
1582 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1583 1989
1584 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;
1585 1993
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1995
1588 glEnable GL_BLEND; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1997
1589 glEnable GL_TEXTURE_2D; 1998 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1999 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 2000 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 2001}
1599 2002
1600############################################################################# 2003#############################################################################
1601 2004
1602package CFClient::UI::Image; 2005package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 2048 glTranslate 0, -$self->{w}, 0;
1646 2049
1647 ($w, $h) = ($h, $w); 2050 ($w, $h) = ($h, $w);
1648 } 2051 }
1649 2052
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 2055
1655 $tex->draw_quad (0, 0, $w, $h); 2056 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 2057
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 2058 glDisable GL_TEXTURE_2D;
1659} 2059}
1660 2060
1661############################################################################# 2061#############################################################################
1662 2062
… …
1710} 2110}
1711 2111
1712sub set_max { 2112sub set_max {
1713 my ($self, $max) = @_; 2113 my ($self, $max) = @_;
1714 2114
2115 return if $self->{max_val} == $max;
2116
1715 $self->{max_val} = $max; 2117 $self->{max_val} = $max;
2118 $self->update;
1716} 2119}
1717 2120
1718sub set_value { 2121sub set_value {
1719 my ($self, $val, $max) = @_; 2122 my ($self, $val, $max) = @_;
1720 2123
1721 $self->set_max ($max) 2124 $self->set_max ($max)
1722 if defined $max; 2125 if defined $max;
1723 2126
1724 $max = $self->{max_val}; 2127 return if $self->{val} == $val;
2128
1725 $self->{val} = $val; 2129 $self->{val} = $val;
1726
1727 $self->update; 2130 $self->update;
1728} 2131}
1729 2132
1730sub _draw { 2133sub _draw {
1731 my ($self) = @_; 2134 my ($self) = @_;
… …
1749 2152
1750 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1752 2155
1753 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1754 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;
1755 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1757 2161
1758 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1759 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
1794 2198
1795sub new { 2199sub new {
1796 my ($class, %arg) = @_; 2200 my ($class, %arg) = @_;
1797 2201
1798 my $self = $class->SUPER::new ( 2202 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 2203 tooltip => $arg{type},
2204 can_hover => 1,
1800 can_events => 1, 2205 can_events => 1,
1801 can_hover => 1,
1802 %arg, 2206 %arg,
1803 ); 2207 );
1804 2208
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2210 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1814 2218
1815 $self->{value}->set_fontsize ($fsize); 2219 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize); 2220 $self->{max} ->set_fontsize ($fsize);
1817} 2221}
1818 2222
2223sub set_max {
2224 my ($self, $max) = @_;
2225
2226 $self->{gauge}->set_max ($max);
2227 $self->{max}->set_text ($max);
2228}
2229
1819sub set_value { 2230sub set_value {
1820 my ($self, $val, $max) = @_; 2231 my ($self, $val, $max) = @_;
1821 2232
1822 $self->set_max ($max) 2233 $self->set_max ($max)
1823 if defined $max; 2234 if defined $max;
1824 2235
1825 $self->{gauge}->set_value ($val, $max); 2236 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val); 2237 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834} 2238}
1835 2239
1836############################################################################# 2240#############################################################################
1837 2241
1838package CFClient::UI::Slider; 2242package CFClient::UI::Slider;
… …
1848 qw(s1_slider.png s1_slider_bg.png); 2252 qw(s1_slider.png s1_slider_bg.png);
1849 2253
1850sub new { 2254sub new {
1851 my $class = shift; 2255 my $class = shift;
1852 2256
1853 # range [value, low, high, page] 2257 # range [value, low, high, page, unit]
1854 2258
1855 # TODO: 0-width page 2259 # TODO: 0-width page
1856 # TODO: req_w/h are wrong with vertical 2260 # TODO: req_w/h are wrong with vertical
1857 # TODO: calculations are off 2261 # TODO: calculations are off
1858 my $self = $class->SUPER::new ( 2262 my $self = $class->SUPER::new (
1859 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
1860 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],
1861 range => [0, 0, 100, 10], 2267 range => [0, 0, 100, 10, 0],
1862 req_w => 20, 2268 min_w => $::WIDTH / 80,
1863 req_h => 20, 2269 min_h => $::WIDTH / 80,
1864 vertical => 0, 2270 vertical => 0,
1865 can_hover => 1, 2271 can_hover => 1,
1866 inner_pad => 5, 2272 inner_pad => 0.02,
1867 @_ 2273 @_
1868 ); 2274 );
1869 2275
2276 $self->set_value ($self->{range}[0]);
2277 $self->update;
2278
1870 $self 2279 $self
1871} 2280}
1872 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
1873sub size_request { 2316sub size_request {
1874 my ($self) = @_; 2317 my ($self) = @_;
1875 2318
1876 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
1877 my $h = $self->{req_h};
1878
1879 $self->{vertical} ? ($h, $w) : ($w, $h)
1880} 2320}
1881 2321
1882sub button_down { 2322sub button_down {
1883 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
1884 2324
1885 $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
1886 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
1887} 2330}
1888 2331
1889sub mouse_motion { 2332sub mouse_motion {
1890 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
1891 2334
1892 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
1893 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2364 my $range = ($hi - $page - $lo) || 1e-100;
1894 2365
1895 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2366 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1896 2367
1897 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2368 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1898 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2369 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1899 2370
1900 $x -= $inner_pad_px; # substract the padding 2371 $value = ($value - $lo) / $range;
1901 $x = $x * ($hi - $lo) / $inner_w + $lo; 2372 $value = $value * $self->{scale} + $self->{offset};
1902 $x = $lo if $x < $lo;
1903 $x = $hi - $page if $x > $hi - $page;
1904 $self->{range}[0] = $x;
1905 2373
1906 $self->emit (changed => $x); 2374 $self->{knob_x} = $value - $knob_w * 0.5;
1907 $self->update; 2375 $self->{knob_w} = $knob_w;
1908 } 2376 }
1909}
1910
1911# the inner_* stuff is for generating a padding for the slider handle,
1912# so that the handle doesn't leave the texture. This calculation isn't 100%
1913# correct propably, but it does the job for now
1914sub _calc_inner_pad_px {
1915 my ($self, $w) = @_;
1916 ($w / 100) * $self->{inner_pad} # % to pixels
1917}
1918
1919sub _draw {
1920 my ($self) = @_;
1921 2377
1922 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
1923 2379
1924 my ($w, $h) = @$self{qw(w h)}; 2380 glScale $self->{w}, $self->{h};
1925 2381
1926 if ($self->{vertical}) { 2382 if ($self->{vertical}) {
1927 # draw a vertical slider like a rotated horizontal slider 2383 # draw a vertical slider like a rotated horizontal slider
1928 2384
2385 glTranslate 1, 0, 0;
1929 glRotate 90, 0, 0, 1; 2386 glRotate 90, 0, 0, 1;
1930 glTranslate 0, -$self->{w}, 0;
1931
1932 ($w, $h) = ($h, $w);
1933 } 2387 }
1934 2388
1935 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2389 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1936 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2390 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1937 2391
1938 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939
1940 $hi = $value + 1 if $lo == $hi;
1941
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944
1945 $page = int $page * $inner_w / ($hi - $lo);
1946 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1947
1948 $w -= $page;
1949 $page &= ~1;
1950 glTranslate $page * 0.5, 0, 0;
1951 $page ||= 2;
1952
1953 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1954 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1955
1956 glEnable GL_BLEND;
1957 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1958 glEnable GL_TEXTURE_2D; 2392 glEnable GL_TEXTURE_2D;
1959 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1960 2394
1961 # draw background 2395 # draw background
1962 $tex[1]->draw_quad (0, 0, $w, $h); 2396 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1963 2397
1964 # draw handle 2398 # draw handle
1965 $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);
1966 2400
1967 glDisable GL_BLEND;
1968 glDisable GL_TEXTURE_2D; 2401 glDisable GL_TEXTURE_2D;
1969} 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 (@_) }
1970 2444
1971############################################################################# 2445#############################################################################
1972 2446
1973package CFClient::UI::TextView; 2447package CFClient::UI::TextView;
1974 2448
… …
1978 2452
1979sub new { 2453sub new {
1980 my $class = shift; 2454 my $class = shift;
1981 2455
1982 my $self = $class->SUPER::new ( 2456 my $self = $class->SUPER::new (
1983 fontsize => 1, 2457 fontsize => 1,
2458 can_events => 0,
1984 #font => default_font 2459 #font => default_font
1985 @_, 2460 @_,
1986 2461
1987 layout => (new CFClient::Layout), 2462 layout => (new CFClient::Layout 1),
1988 par => [], 2463 par => [],
1989 height => 0, 2464 height => 0,
1990 children => [ 2465 children => [
1991 (new CFClient::UI::Empty expand => 1), 2466 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2467 (new CFClient::UI::Slider vertical => 1),
1993 ], 2468 ],
1994 ); 2469 );
1995 2470
1996 $self->{children}[1]->connect (changed => sub { 2471 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2472
2000 $self 2473 $self
2001} 2474}
2002 2475
2003sub set_fontsize { 2476sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2477 my ($self, $fontsize) = @_;
2005 2478
2006 $self->{fontsize} = $fontsize; 2479 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2480 $self->reflow;
2008}
2009
2010sub text_height {
2011 my ($self, $text) = @_;
2012
2013 my $layout = $self->{layout};
2014
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w});
2017 $layout->set_text ($text);
2018
2019 ($layout->size)[1]
2020}
2021
2022sub reflow {
2023 my ($self) = @_;
2024
2025 $self->{need_reflow}++;
2026 $self->update;
2027} 2481}
2028 2482
2029sub size_allocate { 2483sub size_allocate {
2030 my ($self, $w, $h) = @_; 2484 my ($self, $w, $h) = @_;
2031 2485
… …
2036 $self->{layout}->set_width ($self->{children}[0]{w}); 2490 $self->{layout}->set_width ($self->{children}[0]{w});
2037 2491
2038 $self->reflow; 2492 $self->reflow;
2039} 2493}
2040 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
2041sub add_paragraph { 2529sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2530 my ($self, $color, $text, $indent) = @_;
2043 2531
2044 #TODO: intelligently "reformat" paragraph 2532 for my $line (split /\n/, $text) {
2045 2533 my ($w, $h) = $self->text_size ($line);
2046 my $height = $self->text_height ($text);
2047
2048 $self->{height} += $height; 2534 $self->{height} += $h;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2536 }
2049 2537
2050 push @{$self->{par}}, [$height, $color, $text];
2051
2052 $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]);
2053 $self->{children}[1]->update;
2054} 2539}
2055 2540
2056sub update { 2541sub update {
2057 my ($self) = @_; 2542 my ($self) = @_;
2058 2543
… …
2060 2545
2061 return unless $self->{h} > 0; 2546 return unless $self->{h} > 0;
2062 2547
2063 delete $self->{texture}; 2548 delete $self->{texture};
2064 2549
2065 $ROOT->on_refresh ($self, sub { 2550 $ROOT->on_post_alloc ($self, sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552
2066 if (delete $self->{need_reflow}) { 2553 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2554 my $height = 0;
2068 2555
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2070 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 }
2071 2571
2072 $self->{height} = $height; 2572 $self->{height} = $height;
2073 2573
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2075 2575
2076 delete $self->{texture}; 2576 delete $self->{texture};
2077 } 2577 }
2078 2578
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2080 glClearColor 0, 0, 0, 1; 2580 glClearColor 0.5, 0.5, 0.5, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2581 glClear GL_COLOR_BUFFER_BIT;
2082 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
2083 glEnable GL_BLEND; 2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087
2088 my $top = int $self->{children}[1]{range}[0];
2089
2090 my $y0 = $top;
2091 my $y1 = $top + $self->{h};
2092
2093 my $y = 0;
2094
2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
2098 2597
2099 for my $par (@{$self->{par}}) { 2598 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2599 my $h = $par->[1];
2101 2600
2102 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]);
2103 $layout->set_text ($par->[2]); 2604 $layout->set_markup ($par->[4]);
2104 2605
2105 glColor @{ $par->[1] }; 2606 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2607
2107 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;
2108 } 2610 }
2109 2611
2110 $y += $h; 2612 $y += $h;
2111 } 2613 }
2112 2614
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2615 glDisable GL_BLEND;
2115 }; 2616 };
2116 }); 2617 });
2117} 2618}
2118 2619
2119sub _draw { 2620sub _draw {
2120 my ($self) = @_; 2621 my ($self) = @_;
2121 2622
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2124 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;
2125 $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});
2126 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2127 }
2128 2628
2129 $self->{children}[1]->draw; 2629 $self->{children}[1]->draw;
2130 2630
2131} 2631}
2132 2632
… …
2180 2680
2181sub new { 2681sub new {
2182 my $class = shift; 2682 my $class = shift;
2183 2683
2184 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2185 state => 0, 2685 state => 0,
2186 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2187 can_events => 1,
2188 @_ 2687 @_
2189 ); 2688 );
2190 2689
2191 if ($self->{state}) {
2192 $self->{state} = 0;
2193 $self->toggle_flopper;
2194 }
2195
2196 $self 2690 $self
2197} 2691}
2198 2692
2199sub toggle_flopper { 2693sub toggle_flopper {
2200 my ($self) = @_; 2694 my ($self) = @_;
2201 2695
2202 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2203 if ($self->{state} = !$self->{state}) {
2204 $CFClient::UI::ROOT->add ($self->{other});
2205 $self->{other}->move ($self->coord2global (0, $self->{h}));
2206 $self->emit ("open");
2207 } else {
2208 $CFClient::UI::ROOT->remove ($self->{other});
2209 $self->emit ("close");
2210 }
2211
2212 $self->emit (changed => $self->{state});
2213} 2697}
2214 2698
2215############################################################################# 2699#############################################################################
2216 2700
2217package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2227 @_, 2711 @_,
2228 can_events => 0, 2712 can_events => 0,
2229 ) 2713 )
2230} 2714}
2231 2715
2232sub set_markup { 2716sub set_tooltip_from {
2233 my ($self, $text) = @_; 2717 my ($self, $widget) = @_;
2234 2718
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2719 my $tooltip = $widget->{tooltip};
2236 $self->{label}->set_markup ($text); 2720
2237 $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 );
2238} 2736}
2239 2737
2240sub size_request { 2738sub size_request {
2241 my ($self) = @_; 2739 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244 2740
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246 2742
2247 ($w + 4, $h + 4) 2743 ($w + 4, $h + 4)
2248} 2744}
… …
2251 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2252 2748
2253 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254} 2750}
2255 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
2256sub _draw { 2770sub _draw {
2257 my ($self) = @_; 2771 my ($self) = @_;
2258 2772
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375; 2773 glTranslate 0.375, 0.375;
2261 2774
2262 my ($w, $h) = @$self{qw(w h)}; 2775 my ($w, $h) = @$self{qw(w h)};
2263 2776
2264 glColor 1, 0.8, 0.4; 2777 glColor 1, 0.8, 0.4;
… …
2275 glVertex 0 , $h; 2788 glVertex 0 , $h;
2276 glVertex $w, $h; 2789 glVertex $w, $h;
2277 glVertex $w, 0; 2790 glVertex $w, 0;
2278 glEnd; 2791 glEnd;
2279 2792
2280 glPopMatrix; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2281 2794
2282 glTranslate 2, 2;
2283 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2284} 2796}
2285 2797
2286############################################################################# 2798#############################################################################
2287 2799
… …
2292use CFClient::OpenGL; 2804use CFClient::OpenGL;
2293 2805
2294sub new { 2806sub new {
2295 my $class = shift; 2807 my $class = shift;
2296 2808
2297 $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2298 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2299 @_, 2812 @_,
2300 ) 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
2301} 2830}
2302 2831
2303sub size_request { 2832sub size_request {
2304 (32, 8) 2833 (32, 8)
2305} 2834}
2306 2835
2836sub update {
2837 my ($self) = @_;
2838
2839 return unless $self->{visible};
2840
2841 $self->SUPER::update;
2842}
2843
2307sub draw { 2844sub _draw {
2308 my ($self) = @_; 2845 my ($self) = @_;
2309 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
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2311 2859
2312 if ($tex) { 2860 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D; 2861 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1; 2863 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D; 2865 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 } 2866 }
2867}
2868
2869sub DESTROY {
2870 my ($self) = @_;
2871
2872 $self->{timer}->cancel
2873 if $self->{timer};
2874
2875 $self->SUPER::DESTROY;
2322} 2876}
2323 2877
2324############################################################################# 2878#############################################################################
2325 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
2326package CFClient::UI::Root; 3479package CFClient::UI::Root;
2327 3480
2328our @ISA = CFClient::UI::Container::; 3481our @ISA = CFClient::UI::Container::;
2329 3482
2330use CFClient::OpenGL; 3483use CFClient::OpenGL;
2331 3484
2332sub check_size { 3485sub new {
2333 my ($self) = @_; 3486 my $class = shift;
2334 3487
2335 $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
2336} 3496}
2337 3497
2338sub size_request { 3498sub size_request {
2339 ($::WIDTH, $::HEIGHT) 3499 my ($self) = @_;
2340}
2341 3500
2342sub 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 {
2343 my ($self, $x, $y, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
2344 3520
2345 $self->SUPER::configure ($x, $y, $w, $h);
2346
2347 for my $child (@{$self->{children}}) { 3521 for my $child ($self->children) {
2348 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)};
2349 3523
2350 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3524 $X = $child->{force_x} if exists $child->{force_x};
2351 $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
2352 $child->configure ($X, $Y, $W,$H); 3530 $child->configure ($X, $Y, $W, $H);
2353 } 3531 }
2354} 3532}
2355 3533
2356sub _topleft { 3534sub coord2local {
2357 my ($self, $x, $y) = @_; 3535 my ($self, $x, $y) = @_;
2358 3536
2359 ($x, $y) 3537 ($x, $y)
2360} 3538}
2361 3539
3540sub coord2global {
3541 my ($self, $x, $y) = @_;
3542
3543 ($x, $y)
3544}
3545
2362sub update { 3546sub update {
2363 my ($self) = @_; 3547 my ($self) = @_;
2364 3548
2365 $self->check_size; 3549 $::WANT_REFRESH++;
2366 ::refresh ();
2367} 3550}
2368 3551
2369sub add { 3552sub add {
2370 my ($self, $child) = @_; 3553 my ($self, @children) = @_;
2371 3554
2372 # integerize window positions 3555 $_->{is_toplevel} = 1
2373 $child->{x} = int $child->{x}; 3556 for @children;
2374 $child->{y} = int $child->{y};
2375 3557
2376 $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 }
2377} 3574}
2378 3575
2379sub on_refresh { 3576sub on_refresh {
2380 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
2381 3578
2382 $self->{refresh_hook}{$id} = $cb; 3579 $self->{refresh_hook}{$id} = $cb;
2383} 3580}
2384 3581
3582sub on_post_alloc {
3583 my ($self, $id, $cb) = @_;
3584
3585 $self->{post_alloc_hook}{$id} = $cb;
3586}
3587
2385sub draw { 3588sub draw {
2386 my ($self) = @_; 3589 my ($self) = @_;
2387 3590
2388 while (my $rcb = delete $self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
2389 $_->() for values %$rcb; 3592 $_->()
3593 for values %{delete $self->{refresh_hook}};
2390 } 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
2391 3684
2392 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2393 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2394 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
2395 3688
2396 glMatrixMode GL_PROJECTION; 3689 glMatrixMode GL_PROJECTION;
2397 glLoadIdentity; 3690 glLoadIdentity;
2398 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2399 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
2400 glLoadIdentity; 3693 glLoadIdentity;
2401 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
2402 $self->_draw; 3702 $self->_draw;
2403} 3703}
2404 3704
2405############################################################################# 3705#############################################################################
2406 3706
2407package CFClient::UI; 3707package CFClient::UI;
2408 3708
2409$ROOT = new CFClient::UI::Root; 3709$ROOT = new CFClient::UI::Root;
2410$TOOLTIP = new CFClient::UI::Tooltip; 3710$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2411 3711
24121 37121
2413 3713

Diff Legend

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