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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

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