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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

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

Diff Legend

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