ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.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 {
… …
202 return if $self->{parent}; 250 return if $self->{parent};
203 251
204 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
205} 253}
206 254
207sub hide { 255sub set_visible {
208 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
209 279
210 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
212 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
213 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
214 if $self->{parent}; 314 if $self->{parent};
215} 315}
216 316
217sub move { 317sub move_abs {
218 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
219 319
220 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
223 323
224 $self->update; 324 $self->update;
225} 325}
226 326
227sub set_size { 327sub set_size {
228 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
229 329
230 $self->{user_w} = $w; 330 $self->{force_w} = $w;
231 $self->{user_h} = $h; 331 $self->{force_h} = $h;
232 332
233 $self->check_size; 333 $self->realloc;
234} 334}
235 335
236sub size_request { 336sub size_request {
237 require Carp; 337 require Carp;
238 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
240 340
241sub configure { 341sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
243 343
244 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
247 349
248 # use alignment to adjust x, y 350 # use alignment to adjust x, y
249 351
250 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 354 }
255 355
256 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 357 $self->{x} = $x;
258 $self->{y} = $y; 358 $self->{y} = $y;
259 $self->update; 359 $self->update;
260 } 360 }
261 361
262 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
264 } 369 }
265} 370}
266 371
267sub size_allocate { 372sub size_allocate {
268 # nothing to be done 373 # nothing to be done
269} 374}
270 375
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
279} 382}
280 383
281sub set_max_size { 384sub set_max_size {
282 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
283 386
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
391}
392
393sub set_tooltip {
394 my ($self, $tooltip) = @_;
395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
286} 407}
287 408
288# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
289sub coord2local { 410sub coord2local {
290 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 426 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
307 428
308 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
309 430
310 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
311 432
312 $focus->update if $focus; 433 $focus->update if $focus;
313 $FOCUS->update; 434 $FOCUS->update;
314} 435}
315 436
… …
318 439
319 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
320 441
321 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
322 443
323 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
324 445
325 $focus->update if $focus; #? 446 $focus->update if $focus; #?
326}
327 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
328sub mouse_motion { } 452sub mouse_motion { 0 }
329sub button_up { } 453sub button_up { 0 }
330sub key_down { } 454sub key_down { 0 }
331sub key_up { } 455sub key_up { 0 }
332 456
333sub button_down { 457sub button_down {
334 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
335 459
336 $self->focus_in; 460 $self->focus_in;
337}
338 461
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
343sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
344 538
345sub draw { 539sub draw {
346 my ($self) = @_; 540 my ($self) = @_;
347 541
348 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
349 553
350 glPushMatrix; 554 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw;
353 glPopMatrix;
354 556
355 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
356 my ($x, $y) = @$self{qw(x y)};
357
358 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
359 glEnable GL_BLEND; 559 glEnable GL_BLEND;
360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
361 glBegin GL_QUADS; 561 glBegin GL_QUADS;
362 glVertex $x , $y;
363 glVertex $x + $self->{w}, $y;
364 glVertex $x + $self->{w}, $y + $self->{h};
365 glVertex $x , $y + $self->{h};
366 glEnd;
367 glDisable GL_BLEND;
368 }
369
370 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix;
372 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 562 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
379 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
380 glPopMatrix; 580 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
383} 586}
384 587
385sub _draw { 588sub _draw {
386 my ($self) = @_; 589 my ($self) = @_;
387 590
388 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 592}
438 593
439sub DESTROY { 594sub DESTROY {
440 my ($self) = @_; 595 my ($self) = @_;
441 596
… …
456 my $class = shift; 611 my $class = shift;
457 612
458 # range [value, low, high, page] 613 # range [value, low, high, page]
459 614
460 $class->SUPER::new ( 615 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
463 @_ 618 @_
464 ) 619 )
465} 620}
466 621
467sub _draw { 622sub _draw {
468 my ($self) = @_; 623 my ($self) = @_;
469 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
471 631
472 glEnable GL_BLEND; 632 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
475 635
476 glBegin GL_QUADS; 636 glBegin GL_QUADS;
477 glVertex 0 , 0; 637 glVertex 0 , 0;
478 glVertex 0 , $h; 638 glVertex 0 , $h;
479 glVertex $w, $h; 639 glVertex $w, $h;
480 glVertex $w, 0; 640 glVertex $w, 0;
481 glEnd; 641 glEnd;
482 642
483 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
484} 645}
485 646
486############################################################################# 647#############################################################################
487 648
488package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
495} 656}
496 657
497sub size_request { 658sub size_request {
498 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
499} 662}
500 663
501sub draw { } 664sub draw { }
502 665
503############################################################################# 666#############################################################################
… …
507our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
508 671
509sub new { 672sub new {
510 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
511 674
512 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
513 676
514 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
515 children => [], 678 children => [],
516 can_events => 0, 679 can_events => 0,
517 %arg, 680 %arg,
518 ); 681 );
682
519 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
520 685
521 $self 686 $self
522} 687}
523 688
524sub add { 689sub add {
… …
532 $self->{children} = [ 697 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
535 ]; 700 ];
536 701
537 $self->check_size (1); 702 $self->realloc;
538 $self->update;
539} 703}
540 704
541sub children { 705sub children {
542 @{ $_[0]{children} } 706 @{ $_[0]{children} }
543} 707}
… …
548 delete $child->{parent}; 712 delete $child->{parent};
549 $child->hide; 713 $child->hide;
550 714
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 716
553 $self->check_size; 717 $self->realloc;
554 $self->update;
555} 718}
556 719
557sub clear { 720sub clear {
558 my ($self) = @_; 721 my ($self) = @_;
559 722
… …
563 for (@$children) { 726 for (@$children) {
564 delete $_->{parent}; 727 delete $_->{parent};
565 $_->hide; 728 $_->hide;
566 } 729 }
567 730
568 $self->check_size; 731 $self->realloc;
569 $self->update;
570} 732}
571 733
572sub find_widget { 734sub find_widget {
573 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
574 736
575 $x -= $self->{x}; 737 $x -= $self->{x};
576 $y -= $self->{y}; 738 $y -= $self->{y};
577 739
578 my $res; 740 my $res;
579 741
580 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
581 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
582 and return $res; 744 and return $res;
583 } 745 }
584 746
585 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
634 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
635} 797}
636 798
637############################################################################# 799#############################################################################
638 800
801# back-buffered drawing area
802
639package CFClient::UI::Window; 803package CFClient::UI::Window;
640 804
641our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
642 806
643use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
661 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 826 $self->update;
663} 827}
664 828
665sub _render { 829sub _render {
830 my ($self) = @_;
831
666 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
667} 833}
668 834
669sub render_child { 835sub render_child {
670 my ($self) = @_; 836 my ($self) = @_;
671 837
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
675 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
676 $self->_render; 849 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 850 };
685} 851}
686 852
687sub _draw { 853sub _draw {
688 my ($self) = @_; 854 my ($self) = @_;
689 855
690 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
691 857
692 my $tex = $self->{texture} 858 my $tex = $self->{texture}
693 or return; 859 or return;
694 860
695 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
… …
705 871
706package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
707 873
708our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
709 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
710sub size_request { 886sub size_request {
711 my ($self) = @_; 887 my ($self) = @_;
712 888
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 890
716 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
717} 895}
718 896
719sub size_allocate { 897sub size_allocate {
720 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
721 899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
722 $self->update; 906 $self->update;
723} 907}
724 908
725sub set_offset { 909sub set_offset {
726 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
760} 944}
761 945
762sub _render { 946sub _render {
763 my ($self) = @_; 947 my ($self) = @_;
764 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 953
767 $self->SUPER::_render; 954 $self->SUPER::_render;
768} 955}
769 956
… …
772package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
773 960
774our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
775 962
776sub new { 963sub new {
777 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
778 967
779 my $self; 968 my $self;
780 969
781 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
782 vertical => 1, 971 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 973 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
786 }, 975 },
787 ; 976 ;
788 977
789 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 979 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 980 slider => $slider,
792 @_, 981 %arg,
793 ); 982 );
794 983
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
798 986
799 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 1013}
801 1014
802#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 1016# update viewport offset on scroll
804 1017
… …
824 1037
825 if ($self->{bg}) { 1038 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
827 1040
828 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
830 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
831 1044
832 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
833 glVertex 0 , 0; 1046 glVertex 0 , 0;
834 glVertex 0 , $h; 1047 glVertex 0 , $h;
835 glVertex $w, $h; 1048 glVertex $w, $h;
… …
848 1061
849our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
850 1063
851use CFClient::OpenGL; 1064use CFClient::OpenGL;
852 1065
853my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1073
857sub new { 1074sub new {
858 my $class = shift; 1075 my ($class, %arg) = @_;
859 1076
860 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
861 1078
862 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1082 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1083 can_events => 1,
868 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
869 ); 1087 );
870 1088
871 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
872 align => 0, 1090 align => 0,
873 valign => 1, 1091 valign => 1,
874 text => $self->{title}, 1092 text => $title,
875 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
876 1095
877 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
878} 1104}
879 1105
880sub border { 1106sub border {
881 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
882} 1108}
883 1109
884sub size_request { 1110sub size_request {
885 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
886 1115
887 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
888 1117
889 ( 1118 (
890 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
893} 1122}
894 1123
895sub size_allocate { 1124sub size_allocate {
896 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
897 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
898 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
900 1137
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902 if $self->{title};
903
904 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
905} 1139}
906 1140
907sub button_down { 1141sub button_down {
908 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
909 1143
… …
925 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
926 1160
927 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
929 1163
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size; 1168 $self->realloc;
934 }; 1169 };
935 1170
936 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1175 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
942 1177
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
944 1179
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
947 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
948 } 1188 1
949} 1189}
950 1190
951sub button_up { 1191sub button_up {
952 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
953 1193
954 delete $self->{motion}; 1194 !!delete $self->{motion}
955} 1195}
956 1196
957sub mouse_motion { 1197sub mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
959 1199
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
961} 1203}
962 1204
963sub _draw { 1205sub _draw {
964 my ($self) = @_; 1206 my ($self) = @_;
965 1207
1208 my $child = $self->{children}[0];
1209
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1212
969 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1215
972 my $border = $self->border; 1216 my $border = $self->border;
973 1217
974 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1223
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
982 1226
983 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1232 }
994 1233
995 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
996 1235
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1000} 1242}
1001 1243
1002############################################################################# 1244#############################################################################
1003 1245
1004package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1012sub new { 1254sub new {
1013 my $class = shift; 1255 my $class = shift;
1014 1256
1015 $class->SUPER::new ( 1257 $class->SUPER::new (
1016 col_expand => [], 1258 col_expand => [],
1017 @_ 1259 @_,
1018 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1265}
1020 1266
1021sub add { 1267sub add {
1022 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1023 1269
1024 $child->set_parent ($self); 1270 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1026 1272
1027 $child->check_size; 1273 $self->realloc;
1028} 1274}
1029 1275
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1277sub clear {
1036 my ($self) = @_; 1278 my ($self) = @_;
1037 1279
1038 my @children = $self->children; 1280 my @children = $self->children;
1039 delete $self->{children}; 1281 delete $self->{children};
… …
1041 for (@children) { 1283 for (@children) {
1042 delete $_->{parent}; 1284 delete $_->{parent};
1043 $_->hide; 1285 $_->hide;
1044 } 1286 }
1045 1287
1046 $self->update; 1288 $self->realloc;
1047} 1289}
1048 1290
1049sub get_wh { 1291sub get_wh {
1050 my ($self) = @_; 1292 my ($self) = @_;
1051 1293
… …
1082sub size_allocate { 1324sub size_allocate {
1083 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1084 1326
1085 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1086 1328
1087 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1089 1331
1090 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1389 }
1148} 1390}
1149 1391
1150############################################################################# 1392#############################################################################
1151 1393
1152package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1395
1156our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1157 1397
1158sub size_request { 1398sub size_request {
1159 my ($self) = @_; 1399 my ($self) = @_;
1160 1400
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1162 1402 ? (
1163 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1405 )
1166 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1167} 1410}
1168 1411
1169sub size_allocate { 1412sub size_allocate {
1170 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1171 1414
1172 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1416 my $children = $self->{children};
1175 1417
1176 my @h = map $_->{req_w}, @$children; 1418 my @req;
1177 1419
1178 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1179 1421 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1436 }
1194 } 1437 }
1195 1438
1196 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1197 1440
1198 my $y = 0; 1441 my $pos = 0;
1199 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1445
1204 $y += $h; 1446 $pos += $alloc;
1205 } 1447 }
1206 1448
1207 1 1449 1
1208} 1450}
1209 1451
1210############################################################################# 1452#############################################################################
1211 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1212package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1213 1470
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1217 1472
1218sub size_request { 1473sub new {
1219 my ($self) = @_; 1474 my $class = shift;
1220 1475
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1222 1477 vertical => 1,
1223 ( 1478 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1479 )
1227} 1480}
1228 1481
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1482#############################################################################
1269 1483
1270package CFClient::UI::Label; 1484package CFClient::UI::Label;
1271 1485
1272our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1273 1487
1274use CFClient::OpenGL; 1488use CFClient::OpenGL;
1275 1489
1276sub new { 1490sub new {
1277 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1278 1492
1279 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1281 #font => default_font 1497 #font => default_font
1282 #text => initial text 1498 #text => initial text
1283 #markup => initial narkup 1499 #markup => initial narkup
1500 #max_w => maximum pixel width
1501 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1285 fontsize => 1, 1503 fontsize => 1,
1286 align => -1, 1504 align => -1,
1287 valign => -1, 1505 valign => -1,
1288 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1289 can_events => 0, 1508 can_events => 0,
1290 %arg 1509 %arg
1291 ); 1510 );
1292 1511
1293 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1303 } 1522 }
1304 1523
1305 $self 1524 $self
1306} 1525}
1307 1526
1308sub escape { 1527sub escape($) {
1309 local $_ = $_[1]; 1528 local $_ = $_[0];
1310 1529
1311 s/&/&amp;/g; 1530 s/&/&amp;/g;
1312 s/>/&gt;/g; 1531 s/>/&gt;/g;
1313 s/</&lt;/g; 1532 s/</&lt;/g;
1314 1533
1315 $_[1] 1534 $_
1316} 1535}
1317 1536
1318sub update { 1537sub update {
1319 my ($self) = @_; 1538 my ($self) = @_;
1320 1539
1321 delete $self->{texture}; 1540 delete $self->{texture};
1322 $self->SUPER::update; 1541 $self->SUPER::update;
1323} 1542}
1324 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1325sub set_text { 1551sub set_text {
1326 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1327 1553
1328 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1330 1556
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1333 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1334 $self->update; 1562 $self->update;
1335 $self->check_size;
1336} 1563}
1337 1564
1338sub set_markup { 1565sub set_markup {
1339 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1340 1567
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1572
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1348 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1349 $self->update; 1578 $self->update;
1350 $self->check_size;
1351} 1579}
1352 1580
1353sub size_request { 1581sub size_request {
1354 my ($self) = @_; 1582 my ($self) = @_;
1355 1583
1584 $self->{size_req} ||= do {
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1590
1360 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1361 1592
1362 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1363 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1364 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1596
1366 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1367 1598
1368 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1370 } 1604 };
1371 1605
1372 ( 1606 @{ $self->{size_req} }
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1607}
1377 1608
1378sub size_allocate { 1609sub size_allocate {
1379 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1380 1611
1612 delete $self->{ox};
1613
1381 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1616}
1383 1617
1384sub set_fontsize { 1618sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1386 1620
1387 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1622 delete $self->{texture};
1389 1623
1390 $self->update; 1624 $self->realloc;
1391 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1392} 1633}
1393 1634
1394sub _draw { 1635sub _draw {
1395 my ($self) = @_; 1636 my ($self) = @_;
1637
1638 $self->SUPER::_draw; # draw background, if applicable
1396 1639
1397 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1641 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1647
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1414 }; 1649 };
1415 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
1416 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 1662
1419 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1420 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 } 1670 }
1425 1671
1426 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1427} 1673}
… …
1444 active_fg => [0, 0, 0], 1690 active_fg => [0, 0, 0],
1445 can_hover => 1, 1691 can_hover => 1,
1446 can_focus => 1, 1692 can_focus => 1,
1447 valign => 0, 1693 valign => 0,
1448 can_events => 1, 1694 can_events => 1,
1695 #text => ...
1696 #hidden => "*",
1449 @_ 1697 @_
1450 ) 1698 )
1451} 1699}
1452 1700
1453sub _set_text { 1701sub _set_text {
… …
1455 1703
1456 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1457 1705
1458 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1459 1707
1460 delete $self->{texture};
1461
1462 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1463 $self->{text} = $text; 1709 $self->{text} = $text;
1464 1710
1465 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1467 1714
1468 $self->emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1469} 1719}
1470 1720
1471sub set_text { 1721sub set_text {
1472 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1473 1723
1474 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1725 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478} 1726}
1479 1727
1480sub get_text { 1728sub get_text {
1481 $_[0]{text} 1729 $_[0]{text}
1482} 1730}
… …
1485 my ($self) = @_; 1733 my ($self) = @_;
1486 1734
1487 my ($w, $h) = $self->SUPER::size_request; 1735 my ($w, $h) = $self->SUPER::size_request;
1488 1736
1489 ($w + 1, $h) # add 1 for cursor 1737 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1738}
1497 1739
1498sub key_down { 1740sub key_down {
1499 my ($self, $ev) = @_; 1741 my ($self, $ev) = @_;
1500 1742
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1757 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1758 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1759 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1762 $self->_emit ('escape');
1521 } elsif ($uni) { 1763 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1523 } 1767 }
1524 1768
1525 $self->_set_text ($text); 1769 $self->_set_text ($text);
1526 $self->update; 1770
1771 $self->realloc;
1772
1773 1
1527} 1774}
1528 1775
1529sub focus_in { 1776sub focus_in {
1530 my ($self) = @_; 1777 my ($self) = @_;
1531 1778
… …
1546 utf8::encode $text; 1793 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1548 1795
1549 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1550 $self->update; 1797 $self->update;
1798
1799 1
1551} 1800}
1552 1801
1553sub mouse_motion { 1802sub mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1555# 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
1556} 1807}
1557 1808
1558sub _draw { 1809sub _draw {
1559 my ($self) = @_; 1810 my ($self) = @_;
1560 1811
1561 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1562 1813
1563 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1564 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1565 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1566 } else { 1817 } else {
1567 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1568 } 1819 }
1569 1820
1570 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1571 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1573 glVertex 0 , 0; 1824 glVertex 0 , 0;
1574 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1575 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1576 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1611 if ($sym == 13) { 1862 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1863 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1864 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1865 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1866 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1867 $self->_emit (activate => $txt);
1617 $self->update; 1868 $self->update;
1618 1869
1619 } elsif ($sym == CFClient::SDLK_UP) { 1870 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1871 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1872 $self->{history_saveback} = $self->get_text;
… …
1637 } else { 1888 } else {
1638 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1639 } 1890 }
1640 1891
1641 } else { 1892 } else {
1642 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1643 } 1896 1
1644
1645} 1897}
1646 1898
1647############################################################################# 1899#############################################################################
1648 1900
1649package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1658 1910
1659sub new { 1911sub new {
1660 my $class = shift; 1912 my $class = shift;
1661 1913
1662 $class->SUPER::new ( 1914 $class->SUPER::new (
1663 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1664 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1667 can_hover => 1, 1919 can_hover => 1,
1668 align => 0, 1920 align => 0,
1669 valign => 0, 1921 valign => 0,
1670 can_events => 1, 1922 can_events => 1,
1671 @_ 1923 @_
1672 ) 1924 )
1673} 1925}
1674 1926
1927sub activate { }
1928
1675sub button_up { 1929sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1677 1931
1932 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1934 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1935
1681 } 1936 1
1682} 1937}
1683 1938
1684sub _draw { 1939sub _draw {
1685 my ($self) = @_; 1940 my ($self) = @_;
1686 1941
1687 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1688
1689 if ($GRAB == $self) {
1690 $self->{fg} = $self->{active_fg};
1691 }
1692 1943
1693 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1696 1947
… …
1715 1966
1716sub new { 1967sub new {
1717 my $class = shift; 1968 my $class = shift;
1718 1969
1719 $class->SUPER::new ( 1970 $class->SUPER::new (
1720 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1721 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1722 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],
1723 state => 0, 1977 state => 0,
1724 can_hover => 1, 1978 can_hover => 1,
1725 @_ 1979 @_
1726 ) 1980 )
1727} 1981}
1728 1982
1729sub size_request { 1983sub size_request {
1730 my ($self) = @_; 1984 my ($self) = @_;
1731 1985
1732 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1733} 1987}
1734 1988
1735sub button_down { 1989sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1737 1991
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1742 } 2000 1
1743} 2001}
1744 2002
1745sub _draw { 2003sub _draw {
1746 my ($self) = @_; 2004 my ($self) = @_;
1747 2005
1748 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1749 2007
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 2009
1752 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;
1753 2013
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 2015
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 2017
… …
1912 2172
1913 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
1914 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
1915 2175
1916 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
1917 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;
1918 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
1919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920 2181
1921 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
1922 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2272 qw(s1_slider.png s1_slider_bg.png);
2012 2273
2013sub new { 2274sub new {
2014 my $class = shift; 2275 my $class = shift;
2015 2276
2016 # range [value, low, high, page] 2277 # range [value, low, high, page, unit]
2017 2278
2018 # TODO: 0-width page 2279 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2280 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2281 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2287 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2027 vertical => 0, 2290 vertical => 0,
2028 can_hover => 1, 2291 can_hover => 1,
2029 inner_pad => 5, 2292 inner_pad => 0.02,
2030 @_ 2293 @_
2031 ); 2294 );
2032 2295
2296 $self->set_value ($self->{range}[0]);
2297 $self->update;
2298
2033 $self 2299 $self
2034} 2300}
2035 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
2036sub size_request { 2336sub size_request {
2037 my ($self) = @_; 2337 my ($self) = @_;
2038 2338
2039 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2340}
2044 2341
2045sub button_down { 2342sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2047 2344
2048 $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
2049 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2050} 2350}
2051 2351
2052sub mouse_motion { 2352sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2054 2354
2055 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
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2384 my $range = ($hi - $page - $lo) || 1e-100;
2057 2385
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2386 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2387
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2388 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2389 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2390
2063 $x -= $inner_pad_px; # substract the padding 2391 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2392 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2393
2069 $self->emit (changed => $x); 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2395 $self->{knob_w} = $knob_w;
2071 } 2396 }
2072}
2073
2074# the inner_* stuff is for generating a padding for the slider handle,
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084 2397
2085 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2086 2399
2087 my ($w, $h) = @$self{qw(w h)}; 2400 glScale $self->{w}, $self->{h};
2088 2401
2089 if ($self->{vertical}) { 2402 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2403 # draw a vertical slider like a rotated horizontal slider
2091 2404
2405 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2406 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2407 }
2097 2408
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2409 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2410 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2411
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2412 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2414
2122 # draw background 2415 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2416 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2417
2125 # draw handle 2418 # draw handle
2126 $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);
2127 2420
2128 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2129} 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 (@_) }
2130 2464
2131############################################################################# 2465#############################################################################
2132 2466
2133package CFClient::UI::TextView; 2467package CFClient::UI::TextView;
2134 2468
… …
2164 2498
2165 $self->{fontsize} = $fontsize; 2499 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2500 $self->reflow;
2167} 2501}
2168 2502
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2503sub size_allocate {
2189 my ($self, $w, $h) = @_; 2504 my ($self, $w, $h) = @_;
2190 2505
2191 $self->SUPER::size_allocate ($w, $h); 2506 $self->SUPER::size_allocate ($w, $h);
2192 2507
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2511
2197 $self->reflow; 2512 $self->reflow;
2198} 2513}
2199 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
2200sub add_paragraph { 2549sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2550 my ($self, $color, $text, $indent) = @_;
2202 2551
2203 #TODO: intelligently "reformat" paragraph 2552 for my $line (split /\n/, $text) {
2204 2553 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2554 $self->{height} += $h;
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2556 }
2208 2557
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $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]);
2212 $self->{children}[1]->update;
2213} 2559}
2214 2560
2215sub update { 2561sub update {
2216 my ($self) = @_; 2562 my ($self) = @_;
2217 2563
… …
2220 return unless $self->{h} > 0; 2566 return unless $self->{h} > 0;
2221 2567
2222 delete $self->{texture}; 2568 delete $self->{texture};
2223 2569
2224 $ROOT->on_post_alloc ($self, sub { 2570 $ROOT->on_post_alloc ($self, sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572
2225 if (delete $self->{need_reflow}) { 2573 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2574 my $height = 0;
2227 2575
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2229 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 }
2230 2591
2231 $self->{height} = $height; 2592 $self->{height} = $height;
2232 2593
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2595
2235 delete $self->{texture}; 2596 delete $self->{texture};
2236 } 2597 }
2237 2598
2238 $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 {
2239 glClearColor 0, 0, 0, 0; 2600 glClearColor 0, 0, 0, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2601 glClear GL_COLOR_BUFFER_BIT;
2241 2602
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2603 my $top = int $self->{children}[1]{range}[0];
2246 2604
2247 my $y0 = $top; 2605 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2606 my $y1 = $top + $H;
2249 2607
2250 my $y = 0; 2608 my $y = 0;
2251 2609
2252 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2253 2611
2254 $layout->set_font ($self->{font}) if $self->{font}; 2612 $layout->set_font ($self->{font}) if $self->{font};
2255 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
2256 for my $par (@{$self->{par}}) { 2618 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2619 my $h = $par->[1];
2258 2620
2259 if ($y0 < $y + $h && $y < $y1) { 2621 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2622 $layout->set_foreground (@{ $par->[2] });
2623 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2624 $layout->set_markup ($par->[4]);
2262 2625
2263 my ($W, $H) = $layout->size; 2626 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 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;
2265 } 2630 }
2266 2631
2267 $y += $h; 2632 $y += $h;
2268 } 2633 }
2269 2634
2270 glDisable GL_TEXTURE_2D; 2635 glDisable GL_BLEND;
2271 }; 2636 };
2272 }); 2637 });
2273} 2638}
2274 2639
2275sub _draw { 2640sub _draw {
2276 my ($self) = @_; 2641 my ($self) = @_;
2277 2642
2278 glEnable GL_TEXTURE_2D; 2643 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2645 glColor 0, 0, 0, 1;
2281 $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});
2282 glDisable GL_TEXTURE_2D; 2647 glDisable GL_TEXTURE_2D;
2283 2648
2284 $self->{children}[1]->draw; 2649 $self->{children}[1]->draw;
2285 2650
… …
2335 2700
2336sub new { 2701sub new {
2337 my $class = shift; 2702 my $class = shift;
2338 2703
2339 my $self = $class->SUPER::new ( 2704 my $self = $class->SUPER::new (
2340 state => 0, 2705 state => 0,
2341 connect_activate => \&toggle_flopper, 2706 on_activate => \&toggle_flopper,
2342 @_ 2707 @_
2343 ); 2708 );
2344 2709
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2710 $self
2351} 2711}
2352 2712
2353sub toggle_flopper { 2713sub toggle_flopper {
2354 my ($self) = @_; 2714 my ($self) = @_;
2355 2715
2356 # TODO: use animation 2716 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2717}
2368 2718
2369############################################################################# 2719#############################################################################
2370 2720
2371package CFClient::UI::Tooltip; 2721package CFClient::UI::Tooltip;
… …
2384} 2734}
2385 2735
2386sub set_tooltip_from { 2736sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2737 my ($self, $widget) = @_;
2388 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
2389 $self->add (new CFClient::UI::Label 2748 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2749 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2751 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2752 fg => [0, 0, 0, 1],
2753 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2754 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2755 );
2396} 2756}
2397 2757
2398sub size_request { 2758sub size_request {
2399 my ($self) = @_; 2759 my ($self) = @_;
… …
2405 2765
2406sub size_allocate { 2766sub size_allocate {
2407 my ($self, $w, $h) = @_; 2767 my ($self, $w, $h) = @_;
2408 2768
2409 $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 });
2410} 2788}
2411 2789
2412sub _draw { 2790sub _draw {
2413 my ($self) = @_; 2791 my ($self) = @_;
2414 2792
… …
2431 glVertex $w, $h; 2809 glVertex $w, $h;
2432 glVertex $w, 0; 2810 glVertex $w, 0;
2433 glEnd; 2811 glEnd;
2434 2812
2435 glTranslate 2 - 0.375, 2 - 0.375; 2813 glTranslate 2 - 0.375, 2 - 0.375;
2814
2436 $self->SUPER::_draw; 2815 $self->SUPER::_draw;
2437} 2816}
2438 2817
2439############################################################################# 2818#############################################################################
2440 2819
… …
2445use CFClient::OpenGL; 2824use CFClient::OpenGL;
2446 2825
2447sub new { 2826sub new {
2448 my $class = shift; 2827 my $class = shift;
2449 2828
2450 $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2451 aspect => 1, 2830 aspect => 1,
2831 can_events => 0,
2452 @_, 2832 @_,
2453 ) 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
2454} 2850}
2455 2851
2456sub size_request { 2852sub size_request {
2457 (32, 8) 2853 (32, 8)
2458} 2854}
2459 2855
2856sub update {
2857 my ($self) = @_;
2858
2859 return unless $self->{visible};
2860
2861 $self->SUPER::update;
2862}
2863
2460sub _draw { 2864sub _draw {
2461 my ($self) = @_; 2865 my ($self) = @_;
2462 2866
2463 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2878 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2879
2466 # TODO animation
2467 if ($tex) { 2880 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2473 } 2886 }
2474} 2887}
2475 2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 $self->{timer}->cancel
2893 if $self->{timer};
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2476############################################################################# 2898#############################################################################
2477 2899
2478package CFClient::UI::InventoryItem; 2900package CFClient::UI::Buttonbar;
2479 2901
2480our @ISA = CFClient::UI::HBox::; 2902our @ISA = CFClient::UI::HBox::;
2481 2903
2482sub new { 2904# TODO: should actualyl wrap buttons and other goodies.
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589 2905
2590############################################################################# 2906#############################################################################
2591 2907
2592package CFClient::UI::Menu; 2908package CFClient::UI::Menu;
2593 2909
… …
2605 ); 2921 );
2606 2922
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2923 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2608 2924
2609 for my $item (@{ $self->{items} }) { 2925 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item; 2926 my ($widget, $cb, $tooltip) = @$item;
2611 2927
2612 # handle various types of items, only text for now 2928 # handle various types of items, only text for now
2613 if (!ref $widget) { 2929 if (!ref $widget) {
2614 $widget = new CFClient::UI::Label 2930 $widget = new CFClient::UI::Label
2615 can_hover => 1, 2931 can_hover => 1,
2616 can_events => 1, 2932 can_events => 1,
2617 text => $widget; 2933 text => $widget,
2934 tooltip => $tooltip
2618 } 2935 }
2619 2936
2620 $self->{item}{$widget} = $item; 2937 $self->{item}{$widget} = $item;
2621 2938
2622 $self->{vbox}->add ($widget); 2939 $self->{vbox}->add ($widget);
… …
2627 2944
2628# 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)
2629sub popup { 2946sub popup {
2630 my ($self, $ev) = @_; 2947 my ($self, $ev) = @_;
2631 2948
2632 $self->emit ("popdown"); 2949 $self->_emit ("popdown");
2633 2950
2634 # maybe save $GRAB? must be careful about events... 2951 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2952 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2953 $self->{button} = $ev->{button};
2637 2954
2638 $self->show; 2955 $self->show;
2639 $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);
2640} 2957}
2641 2958
2642sub mouse_motion { 2959sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2644 2961
2645 # TODO: should use vbox->find_widget or so 2962 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 2964 $self->{hover} = $self->{item}{$HOVER};
2965
2966 0
2648} 2967}
2649 2968
2650sub button_up { 2969sub button_up {
2651 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2652 2971
2653 if ($ev->{button} == $self->{button}) { 2972 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2973 undef $GRAB;
2655 $self->hide; 2974 $self->hide;
2656 2975
2657 $self->emit ("popdown"); 2976 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2977 $self->{hover}[1]->() if $self->{hover};
2978 } else {
2979 return 0
2980 }
2981
2659 } 2982 1
2660} 2983}
2661 2984
2662############################################################################# 2985#############################################################################
2663 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
2664package CFClient::UI::Statusbox; 3151package CFClient::UI::Statusbox;
2665 3152
2666our @ISA = CFClient::UI::VBox::; 3153our @ISA = CFClient::UI::VBox::;
2667 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
2668sub reorder { 3170sub reorder {
2669 my ($self) = @_; 3171 my ($self) = @_;
2670 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} };
2671 3178
2672 while (my ($k, $v) = each %{ $self->{item} }) { 3179 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3180 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 } 3181 }
2675 3182
… …
2678 my @items = sort { 3185 my @items = sort {
2679 $a->{pri} <=> $b->{pri} 3186 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id} 3187 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} }; 3188 } values %{ $self->{item} };
2682 3189
3190 $self->{timer}->interval (1);
3191
2683 my $count = 10 + 1; 3192 my $count = 10 + 1;
2684 for my $item (@items) { 3193 for my $item (@items) {
2685 last unless --$count; 3194 last unless --$count;
2686 3195
2687 push @widgets, $item->{label} ||= do { 3196 my $label = $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all) 3197 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1 3198 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3199 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3200 : $item->{text};
2692 3201
2693 for ($short) { 3202 for ($short) {
2694 s/^\s+//; 3203 s/^\s+//;
2695 s/\012.*/…/s; 3204 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3205 }
2699 3206
2700 new CFClient::UI::Label 3207 new CFClient::UI::Label
2701 markup => $short, 3208 markup => $short,
2702 tooltip => $item->{tooltip}, 3209 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3210 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3211 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3212 fontsize => $item->{fontsize} || $self->{fontsize},
2706 color => $item->{color}, 3213 max_w => $::WIDTH * 0.44,
3214 fg => [@{ $item->{fg} }],
2707 can_events => 1, 3215 can_events => 1,
2708 can_hover => 1 3216 can_hover => 1
2709 }; 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;
2710 } 3230 }
2711 3231
2712 $self->clear; 3232 $self->clear;
2713 $self->SUPER::add (reverse @widgets); 3233 $self->SUPER::add (reverse @widgets);
2714} 3234}
… …
2717 my ($self, $text, %arg) = @_; 3237 my ($self, $text, %arg) = @_;
2718 3238
2719 $text =~ s/^\s+//; 3239 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3240 $text =~ s/\s+$//;
2721 3241
3242 return unless $text;
3243
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3244 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723 3245
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3246 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3247
2726 if (my $item = $self->{item}{$group}) { 3248 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) { 3249 if ($item->{text} eq $text) {
… …
2737 $self->{item}{$group} = { 3259 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3260 id => ++$self->{id},
2739 text => $text, 3261 text => $text,
2740 timeout => $timeout, 3262 timeout => $timeout,
2741 tooltip => $text, 3263 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3264 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3265 pri => 0,
2745 count => 1, 3266 count => 1,
2746 %arg, 3267 %arg,
2747 }; 3268 };
2748 } 3269 }
2749 3270
2750 $self->reorder; 3271 $self->reorder;
2751} 3272}
2752 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
2753############################################################################# 3292#############################################################################
2754 3293
2755package CFClient::UI::Root; 3294package CFClient::UI::Inventory;
2756 3295
2757our @ISA = CFClient::UI::Container::; 3296our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3297
2761sub new { 3298sub new {
2762 my $class = shift; 3299 my $class = shift;
2763 3300
2764 $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 => [],
2765 @_, 3543 @_,
2766 ) 3544 )
2767} 3545}
2768 3546
2769sub configure { 3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2770 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.");
2771 3553
2772 $self->{w} = $w; 3554sub rebuild_spell_list {
2773 $self->{h} = $h; 3555 my ($self) = @_;
2774}
2775 3556
2776sub 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 {
2777 my ($self) = @_; 3602 my ($self, $spell) = @_;
2778 3603
2779 $self->size_allocate ($self->{w}, $self->{h}) 3604 $self->{spell}->{$spell->{name}} = $spell;
2780 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
2781} 3636}
2782 3637
2783sub size_request { 3638sub size_request {
2784 my ($self) = @_; 3639 my ($self) = @_;
2785 3640
2786 ($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
2787} 3656}
2788 3657
2789sub size_allocate { 3658sub size_allocate {
2790 my ($self, $w, $h) = @_; 3659 my ($self, $w, $h) = @_;
2791 3660
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3661 for my $child ($self->children) {
2799 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)};
2800 3663
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3664 $X = $child->{force_x} if exists $child->{force_x};
2802 $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
2803 $child->configure ($X, $Y, $W, $H); 3670 $child->configure ($X, $Y, $W, $H);
2804 } 3671 }
2805} 3672}
2806 3673
2807sub coord2local { 3674sub coord2local {
… …
2817} 3684}
2818 3685
2819sub update { 3686sub update {
2820 my ($self) = @_; 3687 my ($self) = @_;
2821 3688
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3689 $::WANT_REFRESH++;
2824} 3690}
2825 3691
2826sub add { 3692sub add {
2827 my ($self, @children) = @_; 3693 my ($self, @children) = @_;
2828 3694
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3695 $_->{is_toplevel} = 1
2831 3696 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3697
2837 $self->SUPER::add (@children); 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 }
2838} 3714}
2839 3715
2840sub on_refresh { 3716sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3717 my ($self, $id, $cb) = @_;
2842 3718
… …
2855 while ($self->{refresh_hook}) { 3731 while ($self->{refresh_hook}) {
2856 $_->() 3732 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3733 for values %{delete $self->{refresh_hook}};
2858 } 3734 }
2859 3735
2860 if ($self->{check_size}) { 3736 if ($self->{realloc}) {
2861 my @queue = ([], []); 3737 my %queue;
3738 my @queue;
3739 my $widget;
2862 3740
2863 for (;;) { 3741 outer:
2864 if ($self->{check_size}) { 3742 while () {
2865 # heuristic: check containers last 3743 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3744 for $widget (values %$realloc) {
2867 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 }
2868 } 3751 }
2869 3752
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3753 while () {
3754 @queue or last outer;
2871 3755
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3756 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3757 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 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}) {
2880 $widget->{req_w} = $w; 3777 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3778 $widget->{req_h} = $h;
2882 3779
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3780 $self->{size_alloc}{$widget+0} = $widget;
2884 3781
2885 $widget->{parent}->check_size
2886 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 }
2887 } 3789 }
3790
3791 delete $self->{realloc}{$widget+0};
2888 } 3792 }
2889 } 3793 }
2890 3794
2891 while ($self->{size_alloc}) { 3795 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3796 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 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)};
2894 3803
2895 $w = 0 if $w < 0; 3804 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3805 $h = 0 if $h < 0;
2897 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
2898 $widget->{w} = $w; 3814 $widget->{w} = $w;
2899 $widget->{h} = $h; 3815 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3816
2901 $widget->emit (size_allocate => $w, $h); 3817 $widget->emit (size_allocate => $w, $h);
3818 }
2902 } 3819 }
2903 } 3820 }
2904 3821
2905 while ($self->{post_alloc_hook}) { 3822 while ($self->{post_alloc_hook}) {
2906 $_->() 3823 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3824 for values %{delete $self->{post_alloc_hook}};
2908 } 3825 }
2909 3826
3827
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3828 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3829 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3830 glClear GL_COLOR_BUFFER_BIT;
2913 3831
2914 glMatrixMode GL_PROJECTION; 3832 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3833 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3835 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3836 glLoadIdentity;
2919 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
2920 $self->_draw; 3845 $self->_draw;
2921} 3846}
2922 3847
2923############################################################################# 3848#############################################################################
2924 3849
2925package CFClient::UI; 3850package CFClient::UI;
2926 3851
2927$ROOT = new CFClient::UI::Root; 3852$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3853$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3854
29301 38551
2931 3856

Diff Legend

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