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

Diff Legend

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