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.145 by elmex, Fri Apr 21 12:27:20 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->{owner} = $widget;
46
47 my $tip = $widget->{tooltip};
48
49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50
51 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 }
63
64 return;
65 }
66 }
67 }
68
69 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner};
71}
14 72
15# class methods for events 73# class methods for events
16sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
18} 77}
19 78
20sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
22} 82}
23 83
24sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
25 my ($ev) = @_; 85 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 88 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
30 90
31 $GRAB = $widget; 91 $GRAB = $widget;
32 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93
94 check_tooltip;
33 } 95 }
34 96
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 98
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
38} 101}
39 102
40sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
41 my ($ev) = @_; 104 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
43 106
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 108
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 110
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
49 113
50 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 116 $grab->update if $grab;
53 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118
119 check_tooltip;
54 } 120 }
55} 121}
56 122
57sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
58 my ($ev) = @_; 124 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 129 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
65 131
66 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 134
135 check_tooltip;
136 }
137
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
71} 140}
72 141
73# convert position array to integers 142# convert position array to integers
74sub harmonize { 143sub harmonize {
75 my ($vals) = @_; 144 my ($vals) = @_;
… …
81 $rem += $_ - $i; 150 $rem += $_ - $i;
82 $_ = $i; 151 $_ = $i;
83 } 152 }
84} 153}
85 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 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
189}
190
86############################################################################# 191#############################################################################
87 192
88package CFClient::UI::Base; 193package CFClient::UI::Base;
89 194
90use strict; 195use strict;
… …
93 198
94sub new { 199sub new {
95 my $class = shift; 200 my $class = shift;
96 201
97 my $self = bless { 202 my $self = bless {
98 x => 0, 203 x => 0,
99 y => 0, 204 y => 0,
100 z => 0, 205 z => 0,
206 can_events => 1,
101 @_ 207 @_
102 }, $class; 208 }, $class;
103 209
104 for (keys %$self) { 210 for (keys %$self) {
105 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
107 } 213 }
108 } 214 }
109 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
110 $self 225 $self
111} 226}
112 227
228sub destroy {
229 my ($self) = @_;
230
231 $self->hide;
232 %$self = ();
233}
234
113sub show { 235sub show {
114 my ($self) = @_; 236 my ($self) = @_;
115
116 return if $self->{parent}; 237 return if $self->{parent};
117 238
118 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
119} 240}
120 241
242sub show_centered {
243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
262
263 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
121sub hide { 272sub hide {
122 my ($self) = @_; 273 my ($self) = @_;
123 274
124 return unless $self->{parent}; 275 $self->set_invisible;
125 276
126 $self->{parent}->remove ($self); 277 $self->{parent}->remove ($self)
278 if $self->{parent};
127} 279}
128 280
129sub move { 281sub move {
130 my ($self, $x, $y, $z) = @_; 282 my ($self, $x, $y, $z) = @_;
131 283
… …
134 $self->{z} = $z if defined $z; 286 $self->{z} = $z if defined $z;
135 287
136 $self->update; 288 $self->update;
137} 289}
138 290
139sub needs_redraw { 291sub set_size {
140 0 292 my ($self, $w, $h) = @_;
293
294 $self->{user_w} = $w;
295 $self->{user_h} = $h;
296
297 $self->check_size;
141} 298}
142 299
143sub size_request { 300sub size_request {
144 require Carp; 301 require Carp;
145 Carp::confess "size_request is abtract"; 302 Carp::confess "size_request is abstract";
146} 303}
147 304
148sub configure { 305sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 306 my ($self, $x, $y, $w, $h) = @_;
150 307
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 309 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 310 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 311
155 # use alignment to adjust x, y 312 # use alignment to adjust x, y
156 313
157 $x += ($w - $w2) * 0.5; 314 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 315 $y += int +($h - $h2) * 0.5;
159 316
160 ($w, $h) = ($w2, $h2); 317 ($w, $h) = ($w2, $h2);
161 } 318 }
162 319
163 if ($self->{x} != $x || $self->{y} != $y) { 320 if ($self->{x} != $x || $self->{y} != $y) {
… …
165 $self->{y} = $y; 322 $self->{y} = $y;
166 $self->update; 323 $self->update;
167 } 324 }
168 325
169 if ($self->{w} != $w || $self->{h} != $h) { 326 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 328 }
176} 329}
177 330
178sub size_allocate { 331sub size_allocate {
179 # nothing to be done 332 # nothing to be done
180} 333}
181 334
182# return top left coordinates 335sub reconfigure {
183sub _topleft { 336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children {
343}
344
345sub set_max_size {
184 my ($self, $x, $y) = @_; 346 my ($self, $w, $h) = @_;
185 347
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h;
350}
351
352sub set_tooltip {
353 my ($self, $tooltip) = @_;
354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
360 $self->{tooltip} = $tooltip;
361
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip;
365 }
187} 366}
188 367
189# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
190sub coord2local { 369sub coord2local {
191 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
192 371
193 my ($X, $Y) = $self->_topleft; 372 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 373}
196 374
197# translate local coordinates to global coordinate system 375# translate local coordinates to global coordinate system
198sub coord2global { 376sub coord2global {
199 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
200 378
201 my ($X, $Y) = $self->_topleft; 379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 380}
204 381
205sub focus_in { 382sub focus_in {
206 my ($self) = @_; 383 my ($self) = @_;
207 384
208 return if $FOCUS == $self; 385 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
210 387
211 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
212 389
213 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
214 391
215 $focus->update if $focus; 392 $focus->update if $focus;
216 $FOCUS->update; 393 $FOCUS->update;
217} 394}
218 395
… …
221 398
222 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
223 400
224 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
225 402
226 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
227 404
228 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
229} 409}
230 410
231sub mouse_motion { } 411sub mouse_motion { }
232sub button_up { } 412sub button_up { }
233sub key_down { } 413sub key_down { }
234sub key_up { } 414sub key_up { }
235 415
236sub button_down { 416sub button_down {
237 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
238 418
239 $self->focus_in; 419 $self->focus_in;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 447 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 448 glVertex $x , $y + $self->{h};
269 glEnd; 449 glEnd;
270 glDisable GL_BLEND; 450 glDisable GL_BLEND;
271 } 451 }
452
453 if ($ENV{PCLIENT_DEBUG}) {
454 glPushMatrix;
455 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1;
462 glEnd;
463 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 }
272} 466}
273 467
274sub _draw { 468sub _draw {
275 my ($self) = @_; 469 my ($self) = @_;
276 470
277 warn "no draw defined for $self\n"; 471 warn "no draw defined for $self\n";
278} 472}
279 473
280sub find_widget { 474sub find_widget {
281 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
282 478
283 return $self 479 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 482
… …
289 485
290sub set_parent { 486sub set_parent {
291 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
292 488
293 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
294} 499}
295 500
296sub check_size { 501sub check_size {
297 my ($self) = @_; 502 my ($self, $forced) = @_;
298 503
299 my ($w, $h) = $self->size_request; 504 $self->{force_alloc} = 1 if $forced;
300 505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308} 506}
309 507
310sub update { 508sub update {
311 my ($self) = @_; 509 my ($self) = @_;
312 510
… …
318 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
319 517
320 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
321} 519}
322 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
323sub emit { 527sub emit {
324 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
325 529
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 530 $self->_emit ($signal, @args)
327 $cb->($self, @args); 531 || $self->$signal (@args);
328 }
329} 532}
330 533
331sub DESTROY { 534sub DESTROY {
332 my ($self) = @_; 535 my ($self) = @_;
333 536
537 delete $WIDGET{$self+0};
334 #$self->deactivate; 538 #$self->deactivate;
335} 539}
336 540
337############################################################################# 541#############################################################################
338 542
… …
347 my $class = shift; 551 my $class = shift;
348 552
349 # range [value, low, high, page] 553 # range [value, low, high, page]
350 554
351 $class->SUPER::new ( 555 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
354 @_ 558 @_
355 ) 559 )
356} 560}
357 561
358sub _draw { 562sub _draw {
359 my ($self) = @_; 563 my ($self) = @_;
360 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
362 571
363 glEnable GL_BLEND; 572 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
366 575
367 glBegin GL_QUADS; 576 glBegin GL_QUADS;
368 glVertex 0 , 0; 577 glVertex 0 , 0;
369 glVertex 0 , $h; 578 glVertex 0 , $h;
370 glVertex $w, $h; 579 glVertex $w, $h;
371 glVertex $w, 0; 580 glVertex $w, 0;
372 glEnd; 581 glEnd;
373 582
374 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
375} 585}
376 586
377############################################################################# 587#############################################################################
378 588
379package CFClient::UI::Empty; 589package CFClient::UI::Empty;
380 590
381our @ISA = CFClient::UI::Base::; 591our @ISA = CFClient::UI::Base::;
592
593sub new {
594 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg);
596}
382 597
383sub size_request { 598sub size_request {
384 (0, 0) 599 (0, 0)
385} 600}
386 601
… …
395sub new { 610sub new {
396 my ($class, %arg) = @_; 611 my ($class, %arg) = @_;
397 612
398 my $children = delete $arg{children} || []; 613 my $children = delete $arg{children} || [];
399 614
400 my $self = $class->SUPER::new (children => [], %arg); 615 my $self = $class->SUPER::new (
616 children => [],
617 can_events => 0,
618 %arg,
619 );
401 $self->add ($_) for @$children; 620 $self->add ($_) for @$children;
402 621
403 $self 622 $self
404} 623}
405 624
406sub add { 625sub add {
407 my ($self, $child) = @_; 626 my ($self, @widgets) = @_;
408 627
409 $child->set_parent ($self); 628 $_->set_parent ($self)
629 for @widgets;
410 630
411 use sort 'stable'; 631 use sort 'stable';
412 632
413 $self->{children} = [ 633 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 634 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 635 @{$self->{children}}, @widgets
416 ]; 636 ];
417 637
418 $child->check_size; 638 $self->check_size (1);
639 $self->update;
640}
641
642sub children {
643 @{ $_[0]{children} }
419} 644}
420 645
421sub remove { 646sub remove {
422 my ($self, $child) = @_; 647 my ($self, $child) = @_;
423 648
424 delete $child->{parent}; 649 delete $child->{parent};
650 $child->hide;
425 651
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 653
654 $self->check_size (1);
655 $self->update;
656}
657
658sub clear {
659 my ($self) = @_;
660
661 my $children = delete $self->{children};
662 $self->{children} = [];
663
664 for (@$children) {
665 delete $_->{parent};
666 $_->hide;
667 }
668
428 $self->check_size; 669 $self->check_size;
670 $self->update;
429} 671}
430 672
431sub find_widget { 673sub find_widget {
432 my ($self, $x, $y) = @_; 674 my ($self, $x, $y) = @_;
433 675
… …
508} 750}
509 751
510sub update { 752sub update {
511 my ($self) = @_; 753 my ($self) = @_;
512 754
513 # we want to do this delayed... 755 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 756 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 757}
527 758
528sub size_allocate { 759sub size_allocate {
529 my ($self, $w, $h) = @_; 760 my ($self, $w, $h) = @_;
530 761
531 $self->child->configure (0, 0, $w, $h); 762 $self->SUPER::size_allocate ($w, $h);
763 $self->update;
764}
532 765
766sub _render {
767 $_[0]{children}[0]->draw;
768}
769
770sub render_child {
771 my ($self) = @_;
772
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT;
776
533 $self->render_chld; 777 $self->_render;
778 };
534} 779}
535 780
536sub _draw { 781sub _draw {
537 my ($self) = @_; 782 my ($self) = @_;
538 783
539 my ($w, $h) = ($self->w, $self->h); 784 my ($w, $h) = ($self->w, $self->h);
540 785
541 my $tex = $self->{texture} 786 my $tex = $self->{texture}
542 or return; 787 or return;
543 788
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1;
548 792
549 $tex->draw_quad (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 794
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
553} 796}
554 797
555############################################################################# 798#############################################################################
556 799
557package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
558 801
559our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
560 803
561sub new { die } 804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
562 813
563sub size_request { 814sub size_request {
564 my ($self) = @_; 815 my ($self) = @_;
565 816
566 @$self{qw(child_w child_h)} = $self->child->size_request; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 818
569 @$self{qw(child_w child_h)} 819 @$self{qw(child_w child_h)}
570} 820}
571 821
822sub size_allocate {
823 my ($self, $w, $h) = @_;
824
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
828 $self->child->configure (0, 0, $w, $h);
829 $self->update;
830}
831
832sub set_offset {
833 my ($self, $x, $y) = @_;
834
835 $self->{view_x} = int $x;
836 $self->{view_y} = int $y;
837
838 $self->update;
839}
840
841# hmm, this does not work for topleft of $self... but we should not ask for that
842sub coord2local {
843 my ($self, $x, $y) = @_;
844
845 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
846}
847
848sub coord2global {
849 my ($self, $x, $y) = @_;
850
851 $x = List::Util::min $self->{w}, $x - $self->{view_x};
852 $y = List::Util::min $self->{h}, $y - $self->{view_y};
853
854 $self->SUPER::coord2global ($x, $y)
855}
856
857sub find_widget {
858 my ($self, $x, $y) = @_;
859
860 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
861 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
862 ) {
863 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
864 } else {
865 $self->CFClient::UI::Base::find_widget ($x, $y)
866 }
867}
868
869sub _render {
870 my ($self) = @_;
871
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873
874 $self->SUPER::_render;
875}
876
877#############################################################################
878
879package CFClient::UI::ScrolledWindow;
880
881our @ISA = CFClient::UI::HBox::;
882
883sub new {
884 my $class = shift;
885
886 my $self;
887
888 my $slider = new CFClient::UI::Slider
889 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix
891 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]);
893 },
894 ;
895
896 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider,
899 @_,
900 );
901
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider});
905
906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
926}
927
928#TODO# update range on size_allocate depending on child
929# update viewport offset on scroll
930
931#############################################################################
932
933package CFClient::UI::Frame;
934
935our @ISA = CFClient::UI::Bin::;
936
937use CFClient::OpenGL;
938
939sub new {
940 my $class = shift;
941
942 $class->SUPER::new (
943 bg => undef,
944 @_,
945 )
946}
947
572sub _draw { 948sub _draw {
573 my ($self) = @_; 949 my ($self) = @_;
574 950
575 $self->{children}[1]->draw; 951 if ($self->{bg}) {
576} 952 my ($w, $h) = @$self{qw(w h)};
577 953
954 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} };
578 957
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS; 958 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0; 959 glVertex 0 , 0;
613 glVertex 0 , $h + 4; 960 glVertex 0 , $h;
614 glVertex $w + 4 , $h + 4; 961 glVertex $w, $h;
615 glVertex $w + 4 , 0; 962 glVertex $w, 0;
616 glEnd; 963 glEnd;
617 964
618 $chld->draw; 965 glDisable GL_BLEND;
966 }
967
968 $self->SUPER::_draw;
619} 969}
620 970
621############################################################################# 971#############################################################################
622 972
623package CFClient::UI::FancyFrame; 973package CFClient::UI::FancyFrame;
… …
634 my $class = shift; 984 my $class = shift;
635 985
636 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
637 987
638 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
641 border => 0.8, 991 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1,
642 @_ 994 @_
643 ); 995 );
644 996
645 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 998 align => 0,
647 valign => 1, 999 valign => 1,
648 text => $self->{title}, 1000 text => $self->{title},
649 fontsize => 1; 1001 fontsize => $self->{border};
650 1002
651 $self 1003 $self
652} 1004}
653 1005
654sub border { 1006sub border {
655 int $_[0]{border} * $::FONTSIZE 1007 int $_[0]{border} * $::FONTSIZE
656} 1008}
657 1009
658sub size_request { 1010sub size_request {
659 my ($self) = @_; 1011 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 1012
663 my ($w, $h) = $self->SUPER::size_request; 1013 my ($w, $h) = $self->SUPER::size_request;
664 1014
665 ( 1015 (
666 $w + $self->border * 2, 1016 $w + $self->border * 2,
… …
672 my ($self, $w, $h) = @_; 1022 my ($self, $w, $h) = @_;
673 1023
674 $h -= List::Util::max 0, $self->border * 2; 1024 $h -= List::Util::max 0, $self->border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1025 $w -= List::Util::max 0, $self->border * 2;
676 1026
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
678 if $self->{title}; 1028 if $self->{title};
679 1029
680 $self->child->configure ($self->border, $self->border, $w, $h); 1030 $self->child->configure ($self->border, $self->border, $w, $h);
681} 1031}
682 1032
683sub button_down { 1033sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1034 my ($self, $ev, $x, $y) = @_;
685 1035
1036 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1037 my $border = $self->border;
687 1038
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1039 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1040 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1041
1042 if ($lr & $td) {
1043 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1044 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1045 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1046
1047 my $mx = $x < $border;
1048 my $my = $y < $border;
1049
694 $self->{motion} = sub { 1050 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
696 1052
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1053 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy;
698 1055
699 $self->{user_w} = $bw + $x - $ox; 1056 $self->{user_x} = $wx + $dx * $mx;
700 $self->{user_h} = $bh + $y - $oy; 1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y});
701 $self->check_size; 1061 $self->check_size;
702 }; 1062 };
703 1063
704 } elsif ($x >= 0 && $x < $self->{w} 1064 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1066 my ($bx, $by) = ($self->{x}, $self->{y});
709 1067
710 $self->{motion} = sub { 1068 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
712 1070
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
714 1072
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1073 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
716 $self->update; 1076 $self->update;
717 }; 1077 };
718 } 1078 }
719} 1079}
720 1080
… …
734 my ($self) = @_; 1094 my ($self) = @_;
735 1095
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1096 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 1098
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1099 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1101
744 my $border = $self->border; 1102 my $border = $self->border;
745 1103
746 glColor @{ $self->{border_bg} }; 1104 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1109
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 1111 my $bg = $tex[0];
753 1112
754 # TODO: repeat texture not scale 1113 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1114 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 1115 my $rep_y = $ch / $bg->{h};
757 1116
758 glColor @{ $self->{bg} }; 1117 glColor @{ $self->{bg} };
759 1118
760 $bg->{s} = $rep_x; 1119 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 1120 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 1121 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 }
764 1124
765 glDisable GL_TEXTURE_2D; 1125 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1126
768 $self->{title}->draw if $self->{title}; 1127 $self->{title}->draw if $self->{title};
1128
769 $self->child->draw; 1129 $self->child->draw;
770} 1130}
771 1131
772############################################################################# 1132#############################################################################
773 1133
… …
782sub new { 1142sub new {
783 my $class = shift; 1143 my $class = shift;
784 1144
785 $class->SUPER::new ( 1145 $class->SUPER::new (
786 col_expand => [], 1146 col_expand => [],
787 @_ 1147 @_,
788 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1153}
790 1154
791sub add { 1155sub add {
792 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
793 1157
794 $child->set_parent ($self); 1158 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
796 1160
797 $child->check_size; 1161 $self->check_size (1);
798} 1162}
799 1163
800# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
801sub clear { 1165sub clear {
802 my ($self) = @_; 1166 my ($self) = @_;
803 1167
1168 my @children = $self->children;
804 delete $self->{children}; 1169 delete $self->{children};
1170
1171 for (@children) {
1172 delete $_->{parent};
1173 $_->hide;
1174 }
1175
1176 $self->check_size (1);
805 $self->update; 1177 $self->update;
806} 1178}
807 1179
808sub get_wh { 1180sub get_wh {
809 my ($self) = @_; 1181 my ($self) = @_;
… …
815 or next; 1187 or next;
816 1188
817 for my $x (0 .. $#$row) { 1189 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1190 my $widget = $row->[$x]
819 or next; 1191 or next;
820 my ($w, $h) = $widget->size_request; 1192 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1193
822 $w[$x] = max $w[$x], $w; 1194 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1195 $h[$y] = max $h[$y], $h;
824 } 1196 }
825 } 1197 }
… …
841sub size_allocate { 1213sub size_allocate {
842 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
843 1215
844 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
845 1217
846 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
848 1220
849 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
930 1302
931 ($h, $w) = ($w, $h); 1303 ($h, $w) = ($w, $h);
932 1304
933 my $children = $self->{children}; 1305 my $children = $self->{children};
934 1306
935 my @h = map +($_->size_request)[0], @$children; 1307 my @h = map $_->{req_w}, @$children;
936 1308
937 my $req_h = List::Util::sum @h; 1309 my $req_h = List::Util::sum @h;
938 1310
939 if ($req_h > $h) { 1311 if ($req_h > $h) {
940 # ah well, not enough space 1312 # ah well, not enough space
… …
986} 1358}
987 1359
988sub size_allocate { 1360sub size_allocate {
989 my ($self, $w, $h) = @_; 1361 my ($self, $w, $h) = @_;
990 1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
991 my $children = $self->{children}; 1365 my $children = $self->{children};
992 1366
993 my @h = map +($_->size_request)[1], @$children; 1367 my @h = map $_->{req_h}, @$children;
994 1368
995 my $req_h = List::Util::sum @h; 1369 my $req_h = List::Util::sum @h;
996 1370
997 if ($req_h > $h) { 1371 if ($req_h > $h) {
998 # ah well, not enough space 1372 # ah well, not enough space
… …
1024 1398
1025############################################################################# 1399#############################################################################
1026 1400
1027package CFClient::UI::Label; 1401package CFClient::UI::Label;
1028 1402
1029our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
1030 1404
1031use CFClient::OpenGL; 1405use CFClient::OpenGL;
1032 1406
1033sub new { 1407sub new {
1034 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
1035 1409
1036 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1412 #bg => none
1413 #active_bg => none
1414 #font => default_font
1415 #text => initial text
1416 #markup => initial narkup
1417 #max_w => maximum pixel width
1418 ellipsise => 3, # end
1419 layout => (new CFClient::Layout),
1038 fontsize => 1, 1420 fontsize => 1,
1039 text => "",
1040 align => -1, 1421 align => -1,
1041 valign => -1, 1422 valign => -1,
1042 padding => 2, 1423 padding => 2,
1043 layout => new CFClient::Layout, 1424 can_events => 0,
1044 %arg 1425 %arg
1045 ); 1426 );
1046 1427
1047 if (exists $self->{template}) { 1428 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1429 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1430 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1431 $self->{template} = $layout;
1051 } 1432 }
1052 1433
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1434 if (exists $self->{markup}) {
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1435 $self->set_markup (delete $self->{markup});
1436 } else {
1437 $self->set_text (delete $self->{text});
1438 }
1055 1439
1056 $self 1440 $self
1057} 1441}
1058 1442
1059sub escape_text { 1443sub escape($) {
1060 local $_ = $_[1]; 1444 local $_ = $_[0];
1061 1445
1062 s/&/&amp;/g; 1446 s/&/&amp;/g;
1063 s/>/&gt;/g; 1447 s/>/&gt;/g;
1064 s/</&lt;/g; 1448 s/</&lt;/g;
1065 1449
1066 $_[1] 1450 $_
1451}
1452
1453sub update {
1454 my ($self) = @_;
1455
1456 delete $self->{texture};
1457 $self->SUPER::update;
1067} 1458}
1068 1459
1069sub set_text { 1460sub set_text {
1070 my ($self, $text) = @_; 1461 my ($self, $text) = @_;
1071 1462
1463 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text";
1465
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1072 $self->{layout}->set_text ($text); 1467 $self->{layout}->set_text ($text);
1073 1468
1074 delete $self->{texture};
1075 $self->update; 1469 $self->update;
1470 $self->check_size;
1076} 1471}
1077 1472
1078sub set_markup { 1473sub set_markup {
1079 my ($self, $markup) = @_; 1474 my ($self, $markup) = @_;
1080 1475
1476 return if $self->{text} eq "M$markup";
1477 $self->{text} = "M$markup";
1478
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1081 $self->{layout}->set_markup ($markup); 1482 $self->{layout}->set_markup ($markup);
1082 1483
1083 delete $self->{texture};
1084 $self->update; 1484 $self->update;
1485 $self->check_size;
1085} 1486}
1086 1487
1087sub size_request { 1488sub size_request {
1088 my ($self) = @_; 1489 my ($self) = @_;
1089 1490
1090 $self->{layout}->set_width; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1496
1093 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1094 1498
1095 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1502
1098 my ($w2, $h2) = $self->{template}->size; 1503 my ($w2, $h2) = $self->{template}->size;
1099 1504
1100 $w = List::Util::max $w, $w2; 1505 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1516 my ($self, $w, $h) = @_;
1112 1517
1113 delete $self->{texture}; 1518 delete $self->{texture};
1114} 1519}
1115 1520
1521sub set_fontsize {
1522 my ($self, $fontsize) = @_;
1523
1524 $self->{fontsize} = $fontsize;
1525 delete $self->{texture};
1526
1527 $self->update;
1528 $self->check_size;
1529}
1530
1116sub _draw { 1531sub _draw {
1117 my ($self) = @_; 1532 my ($self) = @_;
1118 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1119 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1537 $self->{layout}->set_foreground (@{$self->{fg}});
1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1539 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543
1122 new_from_layout CFClient::Texture $self->{layout} 1544 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1548 : ($self->{w} - $tex->{w}) * 0.5);
1549
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1552 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1123 }; 1555 };
1124 1556
1125 glEnable GL_BLEND;
1126 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1127 glEnable GL_TEXTURE_2D; 1557 glEnable GL_TEXTURE_2D;
1128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1129 1559
1560 if ($tex->{format} == GL_ALPHA) {
1130 glColor @{$self->{fg}}; 1561 glColor @{$self->{fg}};
1131
1132 $self->{ox} = int (
1133 $self->{align} < 0 ? $self->{padding}
1134 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1135 : ($self->{w} - $tex->{w}) * 0.5
1136 );
1137
1138 $self->{oy} = int (
1139 $self->{valign} < 0 ? $self->{padding}
1140 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1141 : ($self->{h} - $tex->{h}) * 0.5
1142 );
1143
1144 $tex->draw_quad ($self->{ox}, $self->{oy}); 1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else {
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 }
1145 1566
1146 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1147 glDisable GL_BLEND;
1148} 1568}
1149 1569
1150############################################################################# 1570#############################################################################
1151 1571
1152package CFClient::UI::EntryBase; 1572package CFClient::UI::EntryBase;
… …
1157 1577
1158sub new { 1578sub new {
1159 my $class = shift; 1579 my $class = shift;
1160 1580
1161 $class->SUPER::new ( 1581 $class->SUPER::new (
1162 fg => [1, 1, 1], 1582 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1583 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1584 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1166 can_hover => 1, 1586 can_hover => 1,
1167 can_focus => 1, 1587 can_focus => 1,
1168 valign => 0, 1588 valign => 0,
1589 can_events => 1,
1590 #text => ...
1169 @_ 1591 @_
1170 ) 1592 )
1171} 1593}
1172 1594
1173sub _set_text { 1595sub _set_text {
… …
1183 $self->{text} = $text; 1605 $self->{text} = $text;
1184 1606
1185 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1186 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1187 1609
1188 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1189}
1190
1191sub get_text {
1192 $_[0]{text}
1193}
1194
1195sub size_request {
1196 my ($self) = @_;
1197
1198 my ($w, $h) = $self->SUPER::size_request;
1199
1200 ($w + 1, $h) # add 1 for cursor
1201}
1202
1203sub size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 $self->_set_text ($self->{text});
1207} 1611}
1208 1612
1209sub set_text { 1613sub set_text {
1210 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1211 1615
1212 $self->{cursor} = length $text; 1616 $self->{cursor} = length $text;
1213 $self->_set_text ($text); 1617 $self->_set_text ($text);
1214 $self->update; 1618 $self->update;
1619 $self->check_size;
1620}
1621
1622sub get_text {
1623 $_[0]{text}
1624}
1625
1626sub size_request {
1627 my ($self) = @_;
1628
1629 my ($w, $h) = $self->SUPER::size_request;
1630
1631 ($w + 1, $h) # add 1 for cursor
1215} 1632}
1216 1633
1217sub key_down { 1634sub key_down {
1218 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1219 1636
… …
1221 my $sym = $ev->{sym}; 1638 my $sym = $ev->{sym};
1222 my $uni = $ev->{unicode}; 1639 my $uni = $ev->{unicode};
1223 1640
1224 my $text = $self->get_text; 1641 my $text = $self->get_text;
1225 1642
1226 if ($sym == 8) { 1643 if ($uni == 8) {
1227 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1644 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1228 } elsif ($sym == 127) { 1645 } elsif ($uni == 127) {
1229 substr $text, $self->{cursor}, 1, ""; 1646 substr $text, $self->{cursor}, 1, "";
1230 } elsif ($sym == CFClient::SDLK_LEFT) { 1647 } elsif ($sym == CFClient::SDLK_LEFT) {
1231 --$self->{cursor} if $self->{cursor}; 1648 --$self->{cursor} if $self->{cursor};
1232 } elsif ($sym == CFClient::SDLK_RIGHT) { 1649 } elsif ($sym == CFClient::SDLK_RIGHT) {
1233 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1650 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1234 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1235 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1236 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1237 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1238 } elsif ($sym == 27) { 1655 } elsif ($uni == 27) {
1239 $self->emit ('escape'); 1656 $self->_emit ('escape');
1240 } elsif ($uni) { 1657 } elsif ($uni) {
1241 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1242 } 1659 }
1243 1660
1244 $self->_set_text ($text); 1661 $self->_set_text ($text);
1245 $self->update; 1662 $self->update;
1663 $self->check_size;
1246} 1664}
1247 1665
1248sub focus_in { 1666sub focus_in {
1249 my ($self) = @_; 1667 my ($self) = @_;
1250 1668
… …
1326 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1327 1745
1328 my $sym = $ev->{sym}; 1746 my $sym = $ev->{sym};
1329 1747
1330 if ($sym == 13) { 1748 if ($sym == 13) {
1749 unshift @{$self->{history}},
1750 my $txt = $self->get_text;
1751 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1753 $self->_emit (activate => $txt);
1332 $self->update; 1754 $self->update;
1755
1756 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text;
1759 }
1760 if (@{$self->{history} || []} > 0) {
1761 $self->{history_pointer}++;
1762 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1763 $self->{history_pointer} = @{$self->{history} || []} - 1;
1764 }
1765 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1766 }
1767
1768 } elsif ($sym == CFClient::SDLK_DOWN) {
1769 $self->{history_pointer}--;
1770 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1771
1772 if ($self->{history_pointer} >= 0) {
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } else {
1775 $self->set_text ($self->{history_saveback});
1776 }
1333 1777
1334 } else { 1778 } else {
1335 $self->SUPER::key_down ($ev); 1779 $self->SUPER::key_down ($ev);
1336 } 1780 }
1337 1781
… …
1351 1795
1352sub new { 1796sub new {
1353 my $class = shift; 1797 my $class = shift;
1354 1798
1355 $class->SUPER::new ( 1799 $class->SUPER::new (
1356 padding => 4, 1800 padding => 4,
1357 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1802 active_fg => [0, 0, 1],
1360 can_hover => 1, 1803 can_hover => 1,
1361 align => 0, 1804 align => 0,
1362 valign => 0, 1805 valign => 0,
1806 can_events => 1,
1363 @_ 1807 @_
1364 ) 1808 )
1365} 1809}
1366 1810
1811sub activate { }
1812
1367sub button_up { 1813sub button_up {
1368 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1369 1815
1816 $self->emit ("activate")
1370 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1371 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1372 $self->emit ("activate");
1373 }
1374} 1819}
1375 1820
1376sub _draw { 1821sub _draw {
1377 my ($self) = @_; 1822 my ($self) = @_;
1378 1823
… …
1380 1825
1381 if ($GRAB == $self) { 1826 if ($GRAB == $self) {
1382 $self->{fg} = $self->{active_fg}; 1827 $self->{fg} = $self->{active_fg};
1383 } 1828 }
1384 1829
1385 glEnable GL_BLEND;
1386 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1387 glEnable GL_TEXTURE_2D; 1830 glEnable GL_TEXTURE_2D;
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1389 glColor 0, 0, 0, 1; 1832 glColor 0, 0, 0, 1;
1390 1833
1391 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1834 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1392 1835
1393 glDisable GL_TEXTURE_2D; 1836 glDisable GL_TEXTURE_2D;
1394 glDisable GL_BLEND;
1395 1837
1396 $self->SUPER::_draw; 1838 $self->SUPER::_draw;
1397} 1839}
1398 1840
1399############################################################################# 1841#############################################################################
… …
1413 1855
1414 $class->SUPER::new ( 1856 $class->SUPER::new (
1415 padding => 2, 1857 padding => 2,
1416 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1417 active_fg => [1, 1, 0], 1859 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5],
1418 state => 0, 1862 state => 0,
1419 can_hover => 1, 1863 can_hover => 1,
1420 @_ 1864 @_
1421 ) 1865 )
1422} 1866}
… …
1431 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1432 1876
1433 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1434 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1435 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1436 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1437 } 1881 }
1438} 1882}
1439 1883
1440sub _draw { 1884sub _draw {
1441 my ($self) = @_; 1885 my ($self) = @_;
… …
1446 1890
1447 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1448 1892
1449 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1450 1894
1451 glEnable GL_BLEND; 1895 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896
1452 glEnable GL_TEXTURE_2D; 1897 glEnable GL_TEXTURE_2D;
1453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1454
1455 my $tex = $self->{state} ? $tex[1] : $tex[0];
1456
1457 $tex->draw_quad (0, 0, $s, $s); 1898 $tex->draw_quad_alpha (0, 0, $s, $s);
1458
1459 glDisable GL_TEXTURE_2D; 1899 glDisable GL_TEXTURE_2D;
1460 glDisable GL_BLEND;
1461} 1900}
1462 1901
1463############################################################################# 1902#############################################################################
1464 1903
1465package CFClient::UI::Image; 1904package CFClient::UI::Image;
… …
1472our %loaded_images; 1911our %loaded_images;
1473 1912
1474sub new { 1913sub new {
1475 my $class = shift; 1914 my $class = shift;
1476 1915
1477 my $self = $class->SUPER::new (@_); 1916 my $self = $class->SUPER::new (can_events => 0, @_);
1478 1917
1479 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1918 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1480 1919
1481 $loaded_images{$self->{image}} ||= 1920 $loaded_images{$self->{image}} ||=
1482 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1921 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1483 1922
1484 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 1923 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1924
1925 Scalar::Util::weaken $loaded_images{$self->{image}};
1485 1926
1486 $self->{aspect} = $tex->{w} / $tex->{h}; 1927 $self->{aspect} = $tex->{w} / $tex->{h};
1487 1928
1488 $self 1929 $self
1489} 1930}
… …
1506 glTranslate 0, -$self->{w}, 0; 1947 glTranslate 0, -$self->{w}, 0;
1507 1948
1508 ($w, $h) = ($h, $w); 1949 ($w, $h) = ($h, $w);
1509 } 1950 }
1510 1951
1511 glEnable GL_BLEND;
1512 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1513 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1515 1954
1516 $tex->draw_quad (0, 0, $w, $h); 1955 $tex->draw_quad_alpha (0, 0, $w, $h);
1517 1956
1518 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1957 glDisable GL_TEXTURE_2D;
1520} 1958}
1521 1959
1522############################################################################# 1960#############################################################################
1523 1961
1524package CFClient::UI::VGauge; 1962package CFClient::UI::VGauge;
1525 1963
1526our @ISA = CFClient::UI::Base::; 1964our @ISA = CFClient::UI::Base::;
1965
1966use List::Util qw(min max);
1527 1967
1528use CFClient::OpenGL; 1968use CFClient::OpenGL;
1529 1969
1530my %tex = ( 1970my %tex = (
1531 food => [ 1971 food => [
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1972 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1533 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1973 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1534 ], 1974 ],
1535 grace => [ 1975 grace => [
1536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1976 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1537 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1977 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1538 ], 1978 ],
1539 hp => [ 1979 hp => [
1540 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1541 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1981 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1542 ], 1982 ],
1543 mana => [ 1983 mana => [
1544 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1545 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1985 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1546 ], 1986 ],
1547); 1987);
1548 1988
1549# eg. VGauge->new (gauge => 'food'), default gauge: food 1989# eg. VGauge->new (gauge => 'food'), default gauge: food
1550sub new { 1990sub new {
… …
1569} 2009}
1570 2010
1571sub set_max { 2011sub set_max {
1572 my ($self, $max) = @_; 2012 my ($self, $max) = @_;
1573 2013
2014 return if $self->{max_val} == $max;
2015
1574 $self->{max_val} = $max; 2016 $self->{max_val} = $max;
2017 $self->update;
1575} 2018}
1576 2019
1577sub set_value { 2020sub set_value {
1578 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1579 2022
1580 $self->set_max ($max) 2023 $self->set_max ($max)
1581 if defined $max; 2024 if defined $max;
1582 2025
1583 $max = $self->{max_val}; 2026 return if $self->{val} == $val;
2027
1584 $self->{val} = $val; 2028 $self->{val} = $val;
1585
1586 $self->update; 2029 $self->update;
1587} 2030}
1588 2031
1589sub _draw { 2032sub _draw {
1590 my ($self) = @_; 2033 my ($self) = @_;
1591 2034
1592 my $tex = $tex{$self->{type}}; 2035 my $tex = $tex{$self->{type}};
2036 my ($t1, $t2, $t3) = @$tex;
1593 2037
1594 my ($w, $h) = ($self->{w}, $self->{h}); 2038 my ($w, $h) = ($self->{w}, $self->{h});
1595 2039
1596 if ($self->{vertical}) { 2040 if ($self->{vertical}) {
1597 glRotate 90, 0, 0, 1; 2041 glRotate 90, 0, 0, 1;
… …
1599 2043
1600 ($w, $h) = ($h, $w); 2044 ($w, $h) = ($h, $w);
1601 } 2045 }
1602 2046
1603 my $ycut = $self->{val} / ($self->{max_val} || 1); 2047 my $ycut = $self->{val} / ($self->{max_val} || 1);
1604 $ycut = 1 if $self->{val} > $self->{max_val};
1605 2048
1606 my $t1 = $tex->[0]; 2049 my $ycut1 = max 0, min 1, $ycut;
1607 my $t2 = $tex->[1]; 2050 my $ycut2 = max 0, min 1, $ycut - 1;
2051
2052 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2);
1608 2054
1609 glEnable GL_BLEND; 2055 glEnable GL_BLEND;
1610 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1611 glEnable GL_TEXTURE_2D; 2057 glEnable GL_TEXTURE_2D;
1612 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1613 2059
1614 my $h1 = $self->{h} - $ycut * $self->{h};
1615 my $h2 = $ycut * $self->{h};
1616
1617 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2060 glBindTexture GL_TEXTURE_2D, $t1->{name};
1618 glBegin GL_QUADS; 2061 glBegin GL_QUADS;
1619 glTexCoord 0 , 0; glVertex 0 , 0; 2062 glTexCoord 0 , 0; glVertex 0 , 0;
1620 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2063 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1621 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2064 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1622 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2065 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1623 glEnd; 2066 glEnd;
1624 2067
2068 my $ycut1 = List::Util::min 1, $ycut;
1625 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2069 glBindTexture GL_TEXTURE_2D, $t2->{name};
1626 glBegin GL_QUADS; 2070 glBegin GL_QUADS;
1627 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2071 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2072 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1629 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2073 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1630 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2074 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1631 glEnd; 2075 glEnd;
2076
2077 if ($t3) {
2078 glBindTexture GL_TEXTURE_2D, $t3->{name};
2079 glBegin GL_QUADS;
2080 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2081 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2082 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2083 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2084 glEnd;
2085 }
1632 2086
1633 glDisable GL_BLEND; 2087 glDisable GL_BLEND;
1634 glDisable GL_TEXTURE_2D; 2088 glDisable GL_TEXTURE_2D;
1635} 2089}
1636 2090
… …
1639package CFClient::UI::Gauge; 2093package CFClient::UI::Gauge;
1640 2094
1641our @ISA = CFClient::UI::VBox::; 2095our @ISA = CFClient::UI::VBox::;
1642 2096
1643sub new { 2097sub new {
1644 my ($class, %arg) = shift; 2098 my ($class, %arg) = @_;
1645 2099
1646 my $self = $class->SUPER::new ( 2100 my $self = $class->SUPER::new (
1647 @_, 2101 tooltip => $arg{type},
2102 can_hover => 1,
2103 can_events => 1,
2104 %arg,
1648 ); 2105 );
1649 2106
1650 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2107 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1651 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2108 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1652 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2109 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1653 2110
1654 $self 2111 $self
2112}
2113
2114sub set_fontsize {
2115 my ($self, $fsize) = @_;
2116
2117 $self->{value}->set_fontsize ($fsize);
2118 $self->{max} ->set_fontsize ($fsize);
2119}
2120
2121sub set_max {
2122 my ($self, $max) = @_;
2123
2124 $self->{gauge}->set_max ($max);
2125 $self->{max}->set_text ($max);
1655} 2126}
1656 2127
1657sub set_value { 2128sub set_value {
1658 my ($self, $val, $max) = @_; 2129 my ($self, $val, $max) = @_;
1659 2130
1660 $self->set_max ($max) 2131 $self->set_max ($max)
1661 if defined $max; 2132 if defined $max;
1662 2133
1663 $self->{gauge}->set_value ($val, $max); 2134 $self->{gauge}->set_value ($val, $max);
1664 $self->{value}->set_text ($val); 2135 $self->{value}->set_text ($val);
1665}
1666
1667sub set_max {
1668 my ($self, $max) = @_;
1669
1670 $self->{gauge}->set_max ($max);
1671 $self->{max}->set_text ($max);
1672} 2136}
1673 2137
1674############################################################################# 2138#############################################################################
1675 2139
1676package CFClient::UI::Slider; 2140package CFClient::UI::Slider;
… …
1686 qw(s1_slider.png s1_slider_bg.png); 2150 qw(s1_slider.png s1_slider_bg.png);
1687 2151
1688sub new { 2152sub new {
1689 my $class = shift; 2153 my $class = shift;
1690 2154
1691 # range [value, low, high, page] 2155 # range [value, low, high, page, unit]
1692 2156
1693 # TODO: 0-width page 2157 # TODO: 0-width page
1694 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
1695 # TODO: calculations are off 2159 # TODO: calculations are off
1696 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1697 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
1698 active_fg => [0, 0, 0], 2162 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5],
1699 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
1700 req_w => 20, 2166 req_w => $::WIDTH / 80,
1701 req_h => 20, 2167 req_h => $::WIDTH / 80,
1702 vertical => 0, 2168 vertical => 0,
1703 can_hover => 1, 2169 can_hover => 1,
1704 inner_pad => 5, 2170 inner_pad => 0.02,
1705 @_ 2171 @_
1706 ); 2172 );
1707 2173
2174 $self->set_value ($self->{range}[0]);
2175 $self->update;
2176
1708 $self 2177 $self
2178}
2179
2180sub set_range {
2181 my ($self, $range) = @_;
2182
2183 ($range, $self->{range}) = ($self->{range}, $range);
2184
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2187}
2188
2189sub set_value {
2190 my ($self, $value) = @_;
2191
2192 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2193
2194 $hi = $lo + 1 if $hi <= $lo;
2195
2196 $page = $hi - $lo if $page > $hi - $lo;
2197
2198 $value = $lo if $value < $lo;
2199 $value = $hi - $page if $value > $hi - $page;
2200
2201 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2202 if $unit;
2203
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205
2206 if ($value != $old_value) {
2207 $self->_emit (changed => $value);
2208 $self->update;
2209 }
1709} 2210}
1710 2211
1711sub size_request { 2212sub size_request {
1712 my ($self) = @_; 2213 my ($self) = @_;
1713 2214
… …
1719 2220
1720sub button_down { 2221sub button_down {
1721 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1722 2223
1723 $self->SUPER::button_down ($ev, $x, $y); 2224 $self->SUPER::button_down ($ev, $x, $y);
2225
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227
1724 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
1725} 2229}
1726 2230
1727sub mouse_motion { 2231sub mouse_motion {
1728 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
1729 2233
1730 if ($GRAB == $self) { 2234 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236
2237 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2242 }
2243}
2244
2245sub update {
2246 my ($self) = @_;
2247
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2249 $self->set_value ($self->{range}[0]);
2250
1731 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
1732 2253
1733 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1734 2255
1735 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1736 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1737 2258
1738 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
1739 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
1740 $x = $lo if $x < $lo;
1741 $x = $hi - $page if $x > $hi - $page;
1742 $self->{range}[0] = $x;
1743 2261
1744 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
1745 $self->update; 2263 $self->{knob_w} = $knob_w;
1746 } 2264 });
1747}
1748 2265
1749# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
1750# so that the handle doesn't leave the texture. This calculation isn't 100%
1751# correct propably, but it does the job for now
1752sub _calc_inner_pad_px {
1753 my ($self, $w) = @_;
1754 ($w / 100) * $self->{inner_pad} # % to pixels
1755} 2267}
1756 2268
1757sub _draw { 2269sub _draw {
1758 my ($self) = @_; 2270 my ($self) = @_;
1759 2271
1760 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
1761 2273
1762 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
1763 2275
1764 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
1765 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
1766 2278
2279 glTranslate 1, 0, 0;
1767 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
1768 glTranslate 0, -$self->{w}, 0;
1769
1770 ($w, $h) = ($h, $w);
1771 } 2281 }
1772 2282
1773 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1774 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1775 2285
1776 my ($value, $lo, $hi, $page) = @{$self->{range}};
1777
1778 $hi = $value + 1 if $lo == $hi;
1779
1780 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1781 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1782
1783 $page = int $page * $inner_w / ($hi - $lo);
1784 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1785
1786 $w -= $page;
1787 $page &= ~1;
1788 glTranslate $page * 0.5, 0, 0;
1789 $page ||= 2;
1790
1791 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1792 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1793
1794 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1796 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
1797 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1798 2288
1799 # draw background 2289 # draw background
1800 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1801 2291
1802 # draw handle 2292 # draw handle
1803 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1804 2294
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
1807} 2296}
2297
2298#############################################################################
2299
2300package CFClient::UI::ValSlider;
2301
2302our @ISA = CFClient::UI::HBox::;
2303
2304sub new {
2305 my ($class, %arg) = @_;
2306
2307 my $range = delete $arg{range};
2308
2309 my $self = $class->SUPER::new (
2310 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2311 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2312 to_value => sub { shift },
2313 from_value => sub { shift },
2314 %arg,
2315 );
2316
2317 $self->{slider}->connect (changed => sub {
2318 my ($self, $value) = @_;
2319 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2320 $self->{parent}->emit (changed => $value);
2321 });
2322
2323# $self->{entry}->connect (changed => sub {
2324# my ($self, $value) = @_;
2325# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2326# $self->{parent}->emit (changed => $value);
2327# });
2328
2329 $self->add ($self->{slider}, $self->{entry});
2330
2331 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2332
2333 $self
2334}
2335
2336sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) }
1808 2338
1809############################################################################# 2339#############################################################################
1810 2340
1811package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
1812 2342
… …
1816 2346
1817sub new { 2347sub new {
1818 my $class = shift; 2348 my $class = shift;
1819 2349
1820 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
1821 fontsize => 1, 2351 fontsize => 1,
2352 can_events => 0,
2353 #font => default_font
1822 @_, 2354 @_,
1823 2355
1824 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
1825 par => [], 2357 par => [],
1826 height => 0, 2358 height => 0,
1827 children => [ 2359 children => [
1828 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
1829 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
1830 ], 2362 ],
1831 ); 2363 );
1832 2364
1833 $self->{children}[1]->connect (changed => sub { 2365 $self->{children}[1]->connect (changed => sub { $self->update });
1834 $self->update;
1835 });
1836 2366
1837 $self 2367 $self
1838} 2368}
1839 2369
1840sub set_fontsize { 2370sub set_fontsize {
… …
1842 2372
1843 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
1844 $self->reflow; 2374 $self->reflow;
1845} 2375}
1846 2376
2377sub size_allocate {
2378 my ($self, $w, $h) = @_;
2379
2380 $self->SUPER::size_allocate ($w, $h);
2381
2382 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w});
2385
2386 $self->reflow;
2387}
2388
1847sub text_height { 2389sub text_size {
1848 my ($self, $text) = @_; 2390 my ($self, $text, $indent) = @_;
1849 2391
1850 my $layout = $self->{layout}; 2392 my $layout = $self->{layout};
1851 2393
1852 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1853 $layout->set_width ($self->{w}); 2395 $layout->set_width ($self->{children}[0]{w} - $indent);
1854 $layout->set_text ($text); 2396 $layout->set_markup ($text);
1855 2397
1856 ($layout->size)[1] 2398 $layout->size
1857} 2399}
1858 2400
1859sub reflow { 2401sub reflow {
1860 my ($self) = @_; 2402 my ($self) = @_;
1861 2403
1862 $self->{need_reflow}++; 2404 $self->{need_reflow}++;
1863 $self->update; 2405 $self->update;
1864} 2406}
1865 2407
1866sub size_allocate { 2408sub set_offset {
2409 my ($self, $offset) = @_;
2410
2411 # todo: base offset on lines or so, not on pixels
2412 $self->{children}[1]->set_value ($offset);
2413}
2414
2415sub clear {
1867 my ($self, $w, $h) = @_; 2416 my ($self) = @_;
1868 2417
1869 $self->SUPER::size_allocate ($w, $h); 2418 $self->{par} = [];
1870 2419 $self->{height} = 0;
1871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1872 $self->{layout}->set_width ($self->{children}[0]{w});
1873
1874 $self->reflow;
1875} 2421}
1876 2422
1877sub add_paragraph { 2423sub add_paragraph {
1878 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
1879 2425
1880 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
1881 2427 my ($w, $h) = $self->text_size ($line);
1882 my $height = $self->text_height ($text);
1883
1884 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
1885 2431
1886 push @{$self->{par}}, [$height, $color, $text];
1887
1888 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2432 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1889 $self->{children}[1]->update;
1890} 2433}
1891 2434
1892sub update { 2435sub update {
1893 my ($self) = @_; 2436 my ($self) = @_;
1894 2437
… …
1896 2439
1897 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
1898 2441
1899 delete $self->{texture}; 2442 delete $self->{texture};
1900 2443
1901 $ROOT->on_refresh ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
1902 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
1903 my $height = 0; 2448 my $height = 0;
1904 2449
1905 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
1906 for @{$self->{par}}; 2454 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h;
2461 }
2462
2463 $height += $_->[1];
2464 }
1907 2465
1908 $self->{height} = $height; 2466 $self->{height} = $height;
1909 2467
1910 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1911 2469
1912 delete $self->{texture}; 2470 delete $self->{texture};
1913 } 2471 }
1914 2472
1915 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1916 glClearColor 0, 0, 0, 1; 2474 glClearColor 0.5, 0.5, 0.5, 0;
1917 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
1918 2476
2477 my $top = int $self->{children}[1]{range}[0];
2478
2479 my $y0 = $top;
2480 my $y1 = $top + $H;
2481
2482 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487
1919 glEnable GL_BLEND; 2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
1920 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1921 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923
1924 my $top = int $self->{children}[1]{range}[0];
1925
1926 my $y0 = $top;
1927 my $y1 = $top + $self->{h};
1928
1929 my $y = 0;
1930
1931 my $layout = $self->{layout};
1932 2491
1933 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
1934 my $h = $par->[0]; 2493 my $h = $par->[1];
1935 2494
1936 if ($y0 < $y + $h && $y < $y1) { 2495 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]);
1937 $layout->set_text ($par->[2]); 2498 $layout->set_markup ($par->[4]);
1938 2499
1939 glColor @{ $par->[1] }; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1940 my ($W, $H) = $layout->size; 2501
1941 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2502 glRasterPos $par->[3], $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1942 } 2504 }
1943 2505
1944 $y += $h; 2506 $y += $h;
1945 } 2507 }
1946 2508
1947 glDisable GL_TEXTURE_2D;
1948 glDisable GL_BLEND; 2509 glDisable GL_BLEND;
1949 }; 2510 };
1950 }); 2511 });
1951} 2512}
1952 2513
1953sub _draw { 2514sub _draw {
1954 my ($self) = @_; 2515 my ($self) = @_;
1955 2516
1956 if ($self->{texture}) {
1957 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1;
1959 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1960 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
1961 }
1962 2522
1963 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
1964 2524
1965} 2525}
1966 2526
… …
2014 2574
2015sub new { 2575sub new {
2016 my $class = shift; 2576 my $class = shift;
2017 2577
2018 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2019 state => 0, 2579 state => 0,
2020 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2021 @_ 2581 @_
2022 ); 2582 );
2023 2583
2024 if ($self->{state}) { 2584 if ($self->{state}) {
2025 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2034 2594
2035 # TODO: use animation 2595 # TODO: use animation
2036 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2037 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2038 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2039 $self->emit ("open"); 2599 $self->_emit ("open");
2040 } else { 2600 } else {
2041 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2042 $self->emit ("close"); 2602 $self->_emit ("close");
2043 } 2603 }
2044 2604
2045 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2046} 2606}
2047 2607
2048############################################################################# 2608#############################################################################
2049 2609
2610package CFClient::UI::Tooltip;
2611
2612our @ISA = CFClient::UI::Bin::;
2613
2614use CFClient::OpenGL;
2615
2616sub new {
2617 my $class = shift;
2618
2619 $class->SUPER::new (
2620 @_,
2621 can_events => 0,
2622 )
2623}
2624
2625sub set_tooltip_from {
2626 my ($self, $widget) = @_;
2627
2628 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip},
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8,
2632 fg => [0, 0, 0, 1],
2633 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP),
2635 );
2636}
2637
2638sub size_request {
2639 my ($self) = @_;
2640
2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2642
2643 ($w + 4, $h + 4)
2644}
2645
2646sub size_allocate {
2647 my ($self, $w, $h) = @_;
2648
2649 $self->SUPER::size_allocate ($w - 4, $h - 4);
2650}
2651
2652sub _draw {
2653 my ($self) = @_;
2654
2655 glTranslate 0.375, 0.375;
2656
2657 my ($w, $h) = @$self{qw(w h)};
2658
2659 glColor 1, 0.8, 0.4;
2660 glBegin GL_QUADS;
2661 glVertex 0 , 0;
2662 glVertex 0 , $h;
2663 glVertex $w, $h;
2664 glVertex $w, 0;
2665 glEnd;
2666
2667 glColor 0, 0, 0;
2668 glBegin GL_LINE_LOOP;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674
2675 glTranslate 2 - 0.375, 2 - 0.375;
2676 $self->SUPER::_draw;
2677}
2678
2679#############################################################################
2680
2681package CFClient::UI::Face;
2682
2683our @ISA = CFClient::UI::Base::;
2684
2685use CFClient::OpenGL;
2686
2687sub new {
2688 my $class = shift;
2689
2690 my $self = $class->SUPER::new (
2691 aspect => 1,
2692 can_events => 0,
2693 @_,
2694 );
2695
2696 if ($self->{anim} && $self->{animspeed}) {
2697 Scalar::Util::weaken (my $widget = $self);
2698
2699 $self->{timer} = Event->timer (
2700 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2701 hard => 1,
2702 interval => $self->{animspeed},
2703 cb => sub {
2704 ++$widget->{frame};
2705 $widget->update;
2706 },
2707 );
2708 }
2709
2710 $self
2711}
2712
2713sub size_request {
2714 (32, 8)
2715}
2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2725sub _draw {
2726 my ($self) = @_;
2727
2728 return unless $::CONN;
2729
2730 my $face;
2731
2732 if ($self->{frame}) {
2733 my $anim = $::CONN->{anim}[$self->{anim}];
2734
2735 $face = $anim->[ $self->{frame} % @$anim ]
2736 if $anim && @$anim;
2737 }
2738
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740
2741 if ($tex) {
2742 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D;
2747 }
2748}
2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806#############################################################################
2807
2808package CFClient::UI::Menu;
2809
2810our @ISA = CFClient::UI::FancyFrame::;
2811
2812use CFClient::OpenGL;
2813
2814sub new {
2815 my $class = shift;
2816
2817 my $self = $class->SUPER::new (
2818 items => [],
2819 z => 100,
2820 @_,
2821 );
2822
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824
2825 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item;
2827
2828 # handle various types of items, only text for now
2829 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label
2831 can_hover => 1,
2832 can_events => 1,
2833 text => $widget;
2834 }
2835
2836 $self->{item}{$widget} = $item;
2837
2838 $self->{vbox}->add ($widget);
2839 }
2840
2841 $self
2842}
2843
2844# popup given the event (must be a mouse button down event currently)
2845sub popup {
2846 my ($self, $ev) = @_;
2847
2848 $self->_emit ("popdown");
2849
2850 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self;
2852 $self->{button} = $ev->{button};
2853
2854 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856}
2857
2858sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_;
2860
2861 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER};
2864}
2865
2866sub button_up {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB;
2871 $self->hide;
2872
2873 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover};
2875 }
2876}
2877
2878#############################################################################
2879
2880package CFClient::UI::Statusbox;
2881
2882our @ISA = CFClient::UI::VBox::;
2883
2884sub new {
2885 my $class = shift;
2886
2887 $class->SUPER::new (
2888 fontsize => 0.8,
2889 @_,
2890 )
2891}
2892
2893sub reorder {
2894 my ($self) = @_;
2895 my $NOW = time;
2896
2897 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 }
2900
2901 my @widgets;
2902
2903 my @items = sort {
2904 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} };
2907
2908 my $count = 10 + 1;
2909 for my $item (@items) {
2910 last unless --$count;
2911
2912 push @widgets, $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text};
2917
2918 for ($short) {
2919 s/^\s+//;
2920 s/\s+/ /g;
2921 }
2922
2923 new CFClient::UI::Label
2924 markup => $short,
2925 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg},
2931 can_events => 1,
2932 can_hover => 1
2933 };
2934 }
2935
2936 $self->clear;
2937 $self->SUPER::add (reverse @widgets);
2938}
2939
2940sub add {
2941 my ($self, $text, %arg) = @_;
2942
2943 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2947
2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2949
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951
2952 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) {
2954 $item->{count}++;
2955 } else {
2956 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text;
2958 }
2959 $item->{id} = ++$self->{id};
2960 $item->{timeout} = $timeout;
2961 delete $item->{label};
2962 } else {
2963 $self->{item}{$group} = {
2964 id => ++$self->{id},
2965 text => $text,
2966 timeout => $timeout,
2967 tooltip => $text,
2968 fg => [0.8, 0.8, 0.8, 0.8],
2969 pri => 0,
2970 count => 1,
2971 %arg,
2972 };
2973 }
2974
2975 $self->reorder;
2976}
2977
2978sub reconfigure {
2979 my ($self) = @_;
2980
2981 delete $_->{label}
2982 for values %{ $self->{item} || {} };
2983
2984 $self->reorder;
2985 $self->SUPER::reconfigure;
2986}
2987
2988#############################################################################
2989
2050package CFClient::UI::Root; 2990package CFClient::UI::Root;
2051 2991
2052our @ISA = CFClient::UI::Container::; 2992our @ISA = CFClient::UI::Container::;
2053 2993
2054use CFClient::OpenGL; 2994use CFClient::OpenGL;
2055 2995
2056sub check_size { 2996sub new {
2057 my ($self) = @_; 2997 my $class = shift;
2058 2998
2059 $self->configure (0, 0, $::WITH, $::HEIGHT); 2999 $class->SUPER::new (
2060} 3000 visible => 1,
2061 3001 @_,
2062sub size_request { 3002 )
2063 ($::WIDTH, $::HEIGHT)
2064} 3003}
2065 3004
2066sub configure { 3005sub configure {
2067 my ($self, $x, $y, $w, $h) = @_; 3006 my ($self, $x, $y, $w, $h) = @_;
2068 3007
2069 $self->SUPER::configure ($x, $y, $w, $h); 3008 $self->{w} = $w;
2070 3009 $self->{h} = $h;
2071 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2072 for @{$self->{children}};
2073} 3010}
2074 3011
2075sub _topleft { 3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 ($self->{w}, $self->{h})
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
3028 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
3040 $child->configure ($X, $Y, $W, $H);
3041 }
3042}
3043
3044sub coord2local {
2076 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2077 3046
2078 ($x, $y) 3047 ($x, $y)
2079} 3048}
2080 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2081sub update { 3056sub update {
2082 my ($self) = @_; 3057 my ($self) = @_;
2083 3058
2084 $self->check_size; 3059 $self->check_size;
2085 ::refresh (); 3060 $::WANT_REFRESH++;
2086} 3061}
2087 3062
2088sub add { 3063sub add {
2089 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2090 3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1;
3074
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079
2091 $self->SUPER::add ($child); 3080 $self->SUPER::add (@children);
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 $w->set_invisible;
3092 }
2092} 3093}
2093 3094
2094sub on_refresh { 3095sub on_refresh {
2095 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2096 3097
2097 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2098} 3099}
2099 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2100sub draw { 3107sub draw {
2101 my ($self) = @_; 3108 my ($self) = @_;
2102 3109
2103 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2104 $_->() for values %$rcb; 3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
3115 if ($self->{check_size}) {
3116 my @queue;
3117
3118 for (;;) {
3119 if ($self->{check_size}) {
3120 #TODO use array-of-depth approach
3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}};
3124 }
3125
3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
3138 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h;
3140
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3142
3143 $widget->{parent}->check_size
3144 if $widget->{parent};
3145 }
3146 }
3147 }
3148
3149 while ($self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) {
3151 my ($widget, $w, $h) = @$_;
3152
3153 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0;
3155
3156 $widget->{w} = $w;
3157 $widget->{h} = $h;
3158 $widget->emit (size_allocate => $w, $h);
3159 }
3160 }
3161
3162 while ($self->{post_alloc_hook}) {
3163 $_->()
3164 for values %{delete $self->{post_alloc_hook}};
2105 } 3165 }
2106 3166
2107 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3167 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2108 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2109 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2110 3170
2111 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2112 glLoadIdentity; 3172 glLoadIdentity;
2113 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2114 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2115 glLoadIdentity; 3175 glLoadIdentity;
2116 3176
2117 $self->_draw; 3177 $self->_draw;
2118} 3178}
… …
2120############################################################################# 3180#############################################################################
2121 3181
2122package CFClient::UI; 3182package CFClient::UI;
2123 3183
2124$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2125 3186
21261 31871
2127 3188

Diff Legend

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