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

Diff Legend

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