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

Diff Legend

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