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

Diff Legend

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