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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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