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.205 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

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

Diff Legend

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