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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $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
… …
1307 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1308 1548
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1311 1551
1552 $self->realloc;
1312 $self->update; 1553 $self->update;
1313 $self->check_size;
1314} 1554}
1315 1555
1316sub set_markup { 1556sub set_markup {
1317 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1318 1558
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1563
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1326 1566
1567 $self->realloc;
1327 $self->update; 1568 $self->update;
1328 $self->check_size;
1329} 1569}
1330 1570
1331sub size_request { 1571sub size_request {
1332 my ($self) = @_; 1572 my ($self) = @_;
1333 1573
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1574 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1575 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1579
1338 my ($w, $h) = $self->{layout}->size; 1580 my ($w, $h) = $self->{layout}->size;
1339 1581
1340 if (exists $self->{template}) { 1582 if (exists $self->{template}) {
… …
1345 1587
1346 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1348 } 1590 }
1349 1591
1350 ( 1592 ($w, $h)
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1593}
1355 1594
1356sub size_allocate { 1595sub size_allocate {
1357 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1358 1597
1598 delete $self->{ox};
1599
1359 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1360} 1602}
1361 1603
1362sub set_fontsize { 1604sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1364 1606
1365 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1608 delete $self->{texture};
1367 1609
1368 $self->update; 1610 $self->realloc;
1369 $self->check_size;
1370} 1611}
1371 1612
1372sub _draw { 1613sub _draw {
1373 my ($self) = @_; 1614 my ($self) = @_;
1615
1616 $self->SUPER::_draw; # draw background, if applicable
1374 1617
1375 my $tex = $self->{texture} ||= do { 1618 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1619 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1620 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1625
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1382 1628
1629 unless (exists $self->{ox}) {
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1632 : ($self->{w} - $tex->{w}) * 0.5);
1386 1633
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1636 : ($self->{h} - $tex->{h}) * 0.5);
1390
1391 $tex
1392 }; 1637 };
1393 1638
1394 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 1641
1642 glColor_premultiply @{$self->{fg}}
1397 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1398 glColor @{$self->{fg}}; 1644
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1403 1646
1404 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1405} 1648}
1406 1649
1407############################################################################# 1650#############################################################################
… …
1422 active_fg => [0, 0, 0], 1665 active_fg => [0, 0, 0],
1423 can_hover => 1, 1666 can_hover => 1,
1424 can_focus => 1, 1667 can_focus => 1,
1425 valign => 0, 1668 valign => 0,
1426 can_events => 1, 1669 can_events => 1,
1670 #text => ...
1427 @_ 1671 @_
1428 ) 1672 )
1429} 1673}
1430 1674
1431sub _set_text { 1675sub _set_text {
… …
1433 1677
1434 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1435 1679
1436 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1437 1681
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1683 $self->{text} = $text;
1442 1684
1443 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1445 1687
1446 $self->emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1447} 1690}
1448 1691
1449sub set_text { 1692sub set_text {
1450 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1451 1694
1452 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1696 $self->_set_text ($text);
1454 $self->check_size; 1697
1455 $self->update; 1698 $self->realloc;
1456} 1699}
1457 1700
1458sub get_text { 1701sub get_text {
1459 $_[0]{text} 1702 $_[0]{text}
1460} 1703}
… …
1463 my ($self) = @_; 1706 my ($self) = @_;
1464 1707
1465 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1466 1709
1467 ($w + 1, $h) # add 1 for cursor 1710 ($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} 1711}
1475 1712
1476sub key_down { 1713sub key_down {
1477 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1478 1715
… …
1480 my $sym = $ev->{sym}; 1717 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1718 my $uni = $ev->{unicode};
1482 1719
1483 my $text = $self->get_text; 1720 my $text = $self->get_text;
1484 1721
1485 if ($sym == 8) { 1722 if ($uni == 8) {
1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487 } elsif ($sym == 127) { 1724 } elsif ($uni == 127) {
1488 substr $text, $self->{cursor}, 1, ""; 1725 substr $text, $self->{cursor}, 1, "";
1489 } elsif ($sym == CFClient::SDLK_LEFT) { 1726 } elsif ($sym == CFClient::SDLK_LEFT) {
1490 --$self->{cursor} if $self->{cursor}; 1727 --$self->{cursor} if $self->{cursor};
1491 } elsif ($sym == CFClient::SDLK_RIGHT) { 1728 } elsif ($sym == CFClient::SDLK_RIGHT) {
1492 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1729 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1497 } elsif ($sym == 27) { 1734 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1735 $self->_emit ('escape');
1499 } elsif ($uni) { 1736 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1501 } 1740 }
1502 1741
1503 $self->_set_text ($text); 1742 $self->_set_text ($text);
1504 $self->update; 1743
1744 $self->realloc;
1745
1746 1
1505} 1747}
1506 1748
1507sub focus_in { 1749sub focus_in {
1508 my ($self) = @_; 1750 my ($self) = @_;
1509 1751
… …
1524 utf8::encode $text; 1766 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1526 1768
1527 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1528 $self->update; 1770 $self->update;
1771
1772 1
1529} 1773}
1530 1774
1531sub mouse_motion { 1775sub mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1533# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1534} 1780}
1535 1781
1536sub _draw { 1782sub _draw {
1537 my ($self) = @_; 1783 my ($self) = @_;
1538 1784
1539 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1540 1786
1541 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1544 } else { 1790 } else {
1545 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1546 } 1792 }
1547 1793
1548 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1551 glVertex 0 , 0; 1797 glVertex 0 , 0;
1552 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1589 if ($sym == 13) { 1835 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1595 $self->update; 1841 $self->update;
1596 1842
1597 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1615 } else { 1861 } else {
1616 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1617 } 1863 }
1618 1864
1619 } else { 1865 } else {
1620 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1621 } 1869 1
1622
1623} 1870}
1624 1871
1625############################################################################# 1872#############################################################################
1626 1873
1627package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1636 1883
1637sub new { 1884sub new {
1638 my $class = shift; 1885 my $class = shift;
1639 1886
1640 $class->SUPER::new ( 1887 $class->SUPER::new (
1641 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1642 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1645 can_hover => 1, 1892 can_hover => 1,
1646 align => 0, 1893 align => 0,
1647 valign => 0, 1894 valign => 0,
1648 can_events => 1, 1895 can_events => 1,
1649 @_ 1896 @_
1650 ) 1897 )
1651} 1898}
1652 1899
1900sub activate { }
1901
1653sub button_up { 1902sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1655 1904
1905 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1908
1659 } 1909 1
1660} 1910}
1661 1911
1662sub _draw { 1912sub _draw {
1663 my ($self) = @_; 1913 my ($self) = @_;
1664 1914
1665 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670 1916
1671 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1674 1920
… …
1693 1939
1694sub new { 1940sub new {
1695 my $class = shift; 1941 my $class = shift;
1696 1942
1697 $class->SUPER::new ( 1943 $class->SUPER::new (
1698 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1699 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1948 bg => [0, 0, 0, 0.2],
1949 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1950 state => 0,
1702 can_hover => 1, 1951 can_hover => 1,
1703 @_ 1952 @_
1704 ) 1953 )
1705} 1954}
1706 1955
1707sub size_request { 1956sub size_request {
1708 my ($self) = @_; 1957 my ($self) = @_;
1709 1958
1710 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1711} 1960}
1712 1961
1713sub button_down { 1962sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1715 1964
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1720 } 1973 1
1721} 1974}
1722 1975
1723sub _draw { 1976sub _draw {
1724 my ($self) = @_; 1977 my ($self) = @_;
1725 1978
1726 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1727 1980
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 1982
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 1986
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1988
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 1990
… …
1890 2145
1891 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1893 2148
1894 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1896 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2154
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2245 qw(s1_slider.png s1_slider_bg.png);
1990 2246
1991sub new { 2247sub new {
1992 my $class = shift; 2248 my $class = shift;
1993 2249
1994 # range [value, low, high, page] 2250 # range [value, low, high, page, unit]
1995 2251
1996 # TODO: 0-width page 2252 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2253 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2254 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2255 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2258 bg => [0, 0, 0, 0.2],
2259 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2260 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2005 vertical => 0, 2263 vertical => 0,
2006 can_hover => 1, 2264 can_hover => 1,
2007 inner_pad => 5, 2265 inner_pad => 0.02,
2008 @_ 2266 @_
2009 ); 2267 );
2010 2268
2269 $self->set_value ($self->{range}[0]);
2270 $self->update;
2271
2011 $self 2272 $self
2012} 2273}
2013 2274
2275sub changed { }
2276
2277sub set_range {
2278 my ($self, $range) = @_;
2279
2280 ($range, $self->{range}) = ($self->{range}, $range);
2281
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2284}
2285
2286sub set_value {
2287 my ($self, $value) = @_;
2288
2289 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2290
2291 $hi = $lo + 1 if $hi <= $lo;
2292
2293 $page = $hi - $lo if $page > $hi - $lo;
2294
2295 $value = $lo if $value < $lo;
2296 $value = $hi - $page if $value > $hi - $page;
2297
2298 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2299 if $unit;
2300
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302
2303 if ($value != $old_value) {
2304 $self->_emit (changed => $value);
2305 $self->update;
2306 }
2307}
2308
2014sub size_request { 2309sub size_request {
2015 my ($self) = @_; 2310 my ($self) = @_;
2016 2311
2017 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2313}
2022 2314
2023sub button_down { 2315sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2025 2317
2026 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2319
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321
2027 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2028} 2323}
2029 2324
2030sub mouse_motion { 2325sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2032 2327
2033 if ($GRAB == $self) { 2328 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330
2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2332
2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2334
2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2340 1
2341}
2342
2343sub update {
2344 my ($self) = @_;
2345
2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2354 $self->set_value ($self->{range}[0]);
2355
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2357 my $range = ($hi - $page - $lo) || 1e-100;
2035 2358
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2359 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2360
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2361 $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 2362 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2363
2041 $x -= $inner_pad_px; # substract the padding 2364 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2365 $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 2366
2047 $self->emit (changed => $x); 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2368 $self->{knob_w} = $knob_w;
2049 } 2369 }
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 2370
2063 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2064 2372
2065 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
2066 2374
2067 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
2069 2377
2378 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2380 }
2075 2381
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2384
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; 2385 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2387
2100 # draw background 2388 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2390
2103 # draw handle 2391 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2393
2106 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2107} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2108 2437
2109############################################################################# 2438#############################################################################
2110 2439
2111package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2112 2441
… …
2142 2471
2143 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2473 $self->reflow;
2145} 2474}
2146 2475
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 { 2476sub size_allocate {
2167 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2168 2478
2169 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2170 2480
… …
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2484
2175 $self->reflow; 2485 $self->reflow;
2176} 2486}
2177 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2178sub add_paragraph { 2522sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2180 2524
2181 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2182 2526 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2186 2530
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190 $self->{children}[1]->update;
2191} 2532}
2192 2533
2193sub update { 2534sub update {
2194 my ($self) = @_; 2535 my ($self) = @_;
2195 2536
… …
2198 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2199 2540
2200 delete $self->{texture}; 2541 delete $self->{texture};
2201 2542
2202 $ROOT->on_post_alloc ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2203 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2547 my $height = 0;
2205 2548
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2207 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2208 2564
2209 $self->{height} = $height; 2565 $self->{height} = $height;
2210 2566
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2568
2213 delete $self->{texture}; 2569 delete $self->{texture};
2214 } 2570 }
2215 2571
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217 glClearColor 0, 0, 0, 0; 2573 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2219 2575
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]; 2576 my $top = int $self->{children}[1]{range}[0];
2224 2577
2225 my $y0 = $top; 2578 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2227 2580
2228 my $y = 0; 2581 my $y = 0;
2229 2582
2230 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2231 2584
2232 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2233 2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2234 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2592 my $h = $par->[1];
2236 2593
2237 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2240 2598
2241 my ($W, $H) = $layout->size; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2600
2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243 } 2603 }
2244 2604
2245 $y += $h; 2605 $y += $h;
2246 } 2606 }
2247 2607
2248 glDisable GL_TEXTURE_2D; 2608 glDisable GL_BLEND;
2249 }; 2609 };
2250 }); 2610 });
2251} 2611}
2252 2612
2253sub _draw { 2613sub _draw {
2254 my ($self) = @_; 2614 my ($self) = @_;
2255 2615
2256 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2261 2621
2262 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2263 2623
… …
2313 2673
2314sub new { 2674sub new {
2315 my $class = shift; 2675 my $class = shift;
2316 2676
2317 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2318 state => 0, 2678 state => 0,
2319 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2320 @_ 2680 @_
2321 ); 2681 );
2322 2682
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2683 $self
2329} 2684}
2330 2685
2331sub toggle_flopper { 2686sub toggle_flopper {
2332 my ($self) = @_; 2687 my ($self) = @_;
2333 2688
2334 # TODO: use animation 2689 $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} 2690}
2346 2691
2347############################################################################# 2692#############################################################################
2348 2693
2349package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2362} 2707}
2363 2708
2364sub set_tooltip_from { 2709sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2366 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2367 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2724 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2728 );
2374} 2729}
2375 2730
2376sub size_request { 2731sub size_request {
2377 my ($self) = @_; 2732 my ($self) = @_;
… …
2383 2738
2384sub size_allocate { 2739sub size_allocate {
2385 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2386 2741
2387 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2388} 2761}
2389 2762
2390sub _draw { 2763sub _draw {
2391 my ($self) = @_; 2764 my ($self) = @_;
2392 2765
… …
2409 glVertex $w, $h; 2782 glVertex $w, $h;
2410 glVertex $w, 0; 2783 glVertex $w, 0;
2411 glEnd; 2784 glEnd;
2412 2785
2413 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2414 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2415} 2789}
2416 2790
2417############################################################################# 2791#############################################################################
2418 2792
… …
2423use CFClient::OpenGL; 2797use CFClient::OpenGL;
2424 2798
2425sub new { 2799sub new {
2426 my $class = shift; 2800 my $class = shift;
2427 2801
2428 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2429 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2430 @_, 2805 @_,
2431 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2432} 2823}
2433 2824
2434sub size_request { 2825sub size_request {
2435 (32, 8) 2826 (32, 8)
2436} 2827}
2437 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2438sub _draw { 2837sub _draw {
2439 my ($self) = @_; 2838 my ($self) = @_;
2440 2839
2441 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2852
2444 # TODO animation
2445 if ($tex) { 2853 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2451 } 2859 }
2452} 2860}
2453 2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2454############################################################################# 2871#############################################################################
2455 2872
2456package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2457 2874
2458our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2459 2876
2460sub new { 2877# 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 { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562 2878
2563############################################################################# 2879#############################################################################
2564 2880
2565package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2566 2882
… …
2600 2916
2601# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2602sub popup { 2918sub popup {
2603 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2604 2920
2605 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2606 2922
2607 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self; 2924 $GRAB = $self;
2609 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2610 2926
2611 $self->show; 2927 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613} 2929}
2614 2930
2615sub mouse_motion { 2931sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2617 2933
2618 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2621} 2939}
2622 2940
2623sub button_up { 2941sub button_up {
2624 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2625 2943
2626 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB; 2945 undef $GRAB;
2628 $self->hide; 2946 $self->hide;
2629 2947
2630 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2632 } 2954 1
2633} 2955}
2634 2956
2635############################################################################# 2957#############################################################################
2636 2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
2637package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
2638 3068
2639our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::VBox::;
2640 3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
3075 fontsize => 0.8,
3076 @_,
3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
3087}
3088
2641sub reorder { 3089sub reorder {
2642 my ($self) = @_; 3090 my ($self) = @_;
2643 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2644 3092
2645 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 } 3095 }
2648 3096
… …
2650 3098
2651 my @items = sort { 3099 my @items = sort {
2652 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2655 3105
2656 my $count = 10 + 1; 3106 my $count = 10 + 1;
2657 for my $item (@items) { 3107 for my $item (@items) {
2658 last unless --$count; 3108 last unless --$count;
2659 3109
… …
2663 ? "<b>$item->{count} ×</b> $item->{text}" 3113 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 3114 : $item->{text};
2665 3115
2666 for ($short) { 3116 for ($short) {
2667 s/^\s+//; 3117 s/^\s+//;
2668 s/\012.*/…/s; 3118 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 3119 }
2672 3120
2673 new CFClient::UI::Label 3121 new CFClient::UI::Label
2674 markup => $short, 3122 markup => $short,
2675 tooltip => $item->{tooltip}, 3123 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44,
2679 color => $item->{color}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2680 can_events => 1, 3130 can_events => 1,
2681 can_hover => 1 3131 can_hover => 1
2682 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2683 } 3143 }
2684 3144
2685 $self->clear; 3145 $self->clear;
2686 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2687} 3147}
… …
2690 my ($self, $text, %arg) = @_; 3150 my ($self, $text, %arg) = @_;
2691 3151
2692 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2694 3154
3155 return unless $text;
3156
2695 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2696 3158
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698 3160
2699 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2710 $self->{item}{$group} = { 3172 $self->{item}{$group} = {
2711 id => ++$self->{id}, 3173 id => ++$self->{id},
2712 text => $text, 3174 text => $text,
2713 timeout => $timeout, 3175 timeout => $timeout,
2714 tooltip => $text, 3176 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 3177 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 3178 pri => 0,
2718 count => 1, 3179 count => 1,
2719 %arg, 3180 %arg,
2720 }; 3181 };
2721 } 3182 }
2722 3183
2723 $self->reorder; 3184 $self->reorder;
2724} 3185}
2725 3186
3187sub reconfigure {
3188 my ($self) = @_;
3189
3190 delete $_->{label}
3191 for values %{ $self->{item} || {} };
3192
3193 $self->reorder;
3194 $self->SUPER::reconfigure;
3195}
3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2726############################################################################# 3205#############################################################################
2727 3206
2728package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2729 3208
2730our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2731
2732use CFClient::OpenGL;
2733 3210
2734sub new { 3211sub new {
2735 my $class = shift; 3212 my $class = shift;
2736 3213
2737 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
2738 @_, 3456 @_,
2739 ) 3457 )
2740} 3458}
2741 3459
2742sub configure { 3460# XXX: Do sorting? Argl...
2743 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
2744
2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2748
2749sub check_size {
2750 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
2751 3464
2752 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2753 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2754} 3521}
2755 3522
2756sub size_request { 3523sub size_request {
2757 my ($self) = @_; 3524 my ($self) = @_;
2758 3525
2759 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
2760} 3541}
2761 3542
2762sub size_allocate { 3543sub size_allocate {
2763 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2764 3545
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2781 for my $child ($self->children) { 3546 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 3548
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3549 $X = $child->{force_x} if exists $child->{force_x};
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3551
3552 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h};
3554
2786 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
2787 } 3556 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791} 3557}
2792 3558
2793sub coord2local { 3559sub coord2local {
2794 my ($self, $x, $y) = @_; 3560 my ($self, $x, $y) = @_;
2795 3561
… …
2803} 3569}
2804 3570
2805sub update { 3571sub update {
2806 my ($self) = @_; 3572 my ($self) = @_;
2807 3573
2808 $self->check_size;
2809 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
2810} 3575}
2811 3576
2812sub add { 3577sub add {
2813 my ($self, $child) = @_; 3578 my ($self, @children) = @_;
2814 3579
2815 # integerise window positions 3580 $_->{is_toplevel} = 1
2816 $child->{x} = int $child->{x}; 3581 for @children;
2817 $child->{y} = int $child->{y};
2818 3582
2819 $self->SUPER::add ($child); 3583 $self->SUPER::add (@children);
3584}
3585
3586sub remove {
3587 my ($self, @children) = @_;
3588
3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3593
3594 while (@children) {
3595 my $w = pop @children;
3596 push @children, $w->children;
3597 $w->set_invisible;
3598 }
2820} 3599}
2821 3600
2822sub on_refresh { 3601sub on_refresh {
2823 my ($self, $id, $cb) = @_; 3602 my ($self, $id, $cb) = @_;
2824 3603
… …
2837 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
2838 $_->() 3617 $_->()
2839 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
2840 } 3619 }
2841 3620
2842 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
2843 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
2844 3625
2845 for (;;) { 3626 outer:
2846 if ($self->{check_size}) { 3627 while () {
2847 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
2849 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
2850 } 3636 }
2851 3637
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
2853 3640
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
2855 ? @$widget{qw(user_w user_h)} 3642 and last;
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
2862 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
2864 3664
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
2866 3666
2867 $widget->{parent}->check_size
2868 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
2869 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
2870 } 3677 }
2871 } 3678 }
2872 3679
2873 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
2875 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2876 3688
2877 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
2879 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
2880 $widget->{w} = $w; 3699 $widget->{w} = $w;
2881 $widget->{h} = $h; 3700 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h); 3701
2883 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
2884 } 3704 }
2885 } 3705 }
2886 3706
2887 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
2888 $_->() 3708 $_->()
2889 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
2890 } 3710 }
2891 3711
3712
2892 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
2895 3716
2896 glMatrixMode GL_PROJECTION; 3717 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity; 3718 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity; 3721 glLoadIdentity;
2901 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
2902 $self->_draw; 3730 $self->_draw;
2903} 3731}
2904 3732
2905############################################################################# 3733#############################################################################
2906 3734
2907package CFClient::UI; 3735package CFClient::UI;
2908 3736
2909$ROOT = new CFClient::UI::Root; 3737$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 3738$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911 3739
29121 37401
2913 3741

Diff Legend

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