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

Diff Legend

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