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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

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

Diff Legend

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