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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
27 64
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
33 }
34 70
71 check_tooltip;
72 }
73
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 106 my ($x, $y) = ($ev->{x}, $ev->{y});
60 107
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 108 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 109
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
123}
124
125# convert position array to integers
126sub harmonize {
127 my ($vals) = @_;
128
129 my $rem = 0;
130
131 for (@$vals) {
132 my $i = int $_ + $rem;
133 $rem += $_ - $i;
134 $_ = $i;
135 }
71} 136}
72 137
73############################################################################# 138#############################################################################
74 139
75package CFClient::UI::Base; 140package CFClient::UI::Base;
76 141
77use strict; 142use strict;
78 143
79use SDL::OpenGL; 144use CFClient::OpenGL;
80 145
81sub new { 146sub new {
82 my $class = shift; 147 my $class = shift;
83 148
84 bless { 149 my $self = bless {
85 x => 0, 150 x => 0,
86 y => 0, 151 y => 0,
87 z => 0, 152 z => 0,
88 w => -1, 153 can_events => 1,
89 h => -1,
90 @_ 154 @_
91 }, $class 155 }, $class;
156
157 for (keys %$self) {
158 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_});
160 }
161 }
162
163 $self
164}
165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
173sub show {
174 my ($self) = @_;
175
176 return if $self->{parent};
177
178 $CFClient::UI::ROOT->add ($self);
179}
180
181sub hide {
182 my ($self) = @_;
183
184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
186
187 $self->{parent}->remove ($self)
188 if $self->{parent};
92} 189}
93 190
94sub move { 191sub move {
95 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
193
96 $self->{x} = $x; 194 $self->{x} = int $x;
97 $self->{y} = $y; 195 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
99}
100 197
101sub needs_redraw { 198 $self->update;
102 0 199}
200
201sub set_size {
202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
103} 208}
104 209
105sub size_request { 210sub size_request {
106 require Carp; 211 require Carp;
107 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
108} 213}
109 214
110sub _size_allocate { 215sub configure {
111 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
112 217
218 if ($self->{aspect}) {
219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
221
222 # use alignment to adjust x, y
223
224 $x += int +($w - $w2) * 0.5;
225 $y += int +($h - $h2) * 0.5;
226
227 ($w, $h) = ($w2, $h2);
228 }
229
230 if ($self->{x} != $x || $self->{y} != $y) {
113 $self->{x} = $x; 231 $self->{x} = $x;
114 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update;
234 }
115 235
116 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
117
118 $self->{w} = $w; 237 $self->{w} = $w;
119 $self->{h} = $h; 238 $self->{h} = $h;
120 239
240 $self->size_allocate ($w, $h);
241 $self->update;
121 1 242 }
122} 243}
123 244
124sub size_allocate { 245sub size_allocate {
246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
125 my ($self, $x, $y, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
126 264
127 $self->_size_allocate ($x, $y, $w, $h); 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
128} 267}
129 268
130# translate global koordinates to local coordinate system 269# return top left coordinates
131sub translate { 270sub _topleft {
132 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
133 272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277}
278
279# translate global coordinates to local coordinate system
280sub coord2local {
281 my ($self, $x, $y) = @_;
282
283 my ($X, $Y) = $self->_topleft;
284 ($x - $X, $y - $Y)
285}
286
287# translate local coordinates to global coordinate system
288sub coord2global {
289 my ($self, $x, $y) = @_;
290
291 my ($X, $Y) = $self->_topleft;
292 ($x + $X, $y + $Y)
135} 293}
136 294
137sub focus_in { 295sub focus_in {
138 my ($self) = @_; 296 my ($self) = @_;
139 297
140 return if $FOCUS == $self; 298 return if $FOCUS == $self;
299 return unless $self->{can_focus};
141 300
142 my $focus = $FOCUS; $FOCUS = $self; 301 my $focus = $FOCUS; $FOCUS = $self;
302
303 $self->emit (focus_in => $focus);
304
143 $focus->update if $focus; 305 $focus->update if $focus;
144 $FOCUS->update; 306 $FOCUS->update;
145} 307}
146 308
147sub focus_out { 309sub focus_out {
148 my ($self) = @_; 310 my ($self) = @_;
149 311
150 return unless $FOCUS == $self; 312 return unless $FOCUS == $self;
151 313
152 my $focus = $FOCUS; undef $FOCUS; 314 my $focus = $FOCUS; undef $FOCUS;
315
316 $self->emit (focus_out => $focus);
317
153 $focus->update if $focus; #? 318 $focus->update if $focus; #?
154} 319}
155 320
156sub mouse_motion { } 321sub mouse_motion { }
157sub button_up { } 322sub button_up { }
178 glPushMatrix; 343 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 344 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 345 $self->_draw;
181 glPopMatrix; 346 glPopMatrix;
182 347
183 if ($self == $HOVER) { 348 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 349 my ($x, $y) = @$self{qw(x y)};
185 350
186 glColor 0, 0, 1, 0.2; 351 glColor 1, 0.8, 0.5, 0.2;
187 glEnable GL_BLEND; 352 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 354 glBegin GL_QUADS;
190 glVertex $x , $y; 355 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 356 glVertex $x + $self->{w}, $y;
192 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
193 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
194 glEnd; 359 glEnd;
195 glDisable GL_BLEND; 360 glDisable GL_BLEND;
196 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
197} 376}
198 377
199sub _draw { 378sub _draw {
200 my ($self) = @_; 379 my ($self) = @_;
201 380
202 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
203}
204
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214} 382}
215 383
216sub find_widget { 384sub find_widget {
217 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
218 388
219 return $self 389 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 392
223 () 393 ()
224} 394}
225 395
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 396sub set_parent {
229 my ($self, $par) = @_; 397 my ($self, $parent) = @_;
230 398
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 399 Scalar::Util::weaken ($self->{parent} = $parent);
233} 400}
234 401
235sub get_parent { 402sub check_size {
403 my ($self) = @_;
404
236 $_[0]->{parent} 405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
237} 426}
238 427
239sub update { 428sub update {
240 my ($self) = @_; 429 my ($self) = @_;
241 430
244} 433}
245 434
246sub connect { 435sub connect {
247 my ($self, $signal, $cb) = @_; 436 my ($self, $signal, $cb) = @_;
248 437
249 push @{ $self->{cb}{$signal} }, $cb; 438 push @{ $self->{signal_cb}{$signal} }, $cb;
250} 439}
251 440
252sub emit { 441sub emit {
253 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
254 443
255 $_->($self, @args) 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
256 for @{$self->{cb}{$signal} || []};
257} 445}
258 446
259sub DESTROY { 447sub DESTROY {
260 my ($self) = @_; 448 my ($self) = @_;
261 449
267package CFClient::UI::DrawBG; 455package CFClient::UI::DrawBG;
268 456
269our @ISA = CFClient::UI::Base::; 457our @ISA = CFClient::UI::Base::;
270 458
271use strict; 459use strict;
272use SDL::OpenGL; 460use CFClient::OpenGL;
273 461
274sub new { 462sub new {
275 my $class = shift; 463 my $class = shift;
276 464
277 # range [value, low, high, page] 465 # range [value, low, high, page]
278 466
279 $class->SUPER::new ( 467 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 468 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 469 active_bg => [1, 1, 1, 0.5],
282 @_ 470 @_
283 ) 471 )
284} 472}
285 473
286sub _draw { 474sub _draw {
306 494
307package CFClient::UI::Empty; 495package CFClient::UI::Empty;
308 496
309our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
310 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
311sub size_request { 504sub size_request {
312 (0, 0) 505 (0, 0)
313} 506}
314 507
315sub draw { } 508sub draw { }
323sub new { 516sub new {
324 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
325 518
326 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
327 520
328 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
329 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
330 527
331 $self 528 $self
332} 529}
333 530
334sub add { 531sub add {
335 my ($self, $chld) = @_; 532 my ($self, $child) = @_;
336 533
337 $chld->set_parent ($self); 534 $child->set_parent ($self);
535
536 use sort 'stable';
338 537
339 $self->{children} = [ 538 $self->{children} = [
340 sort { $a->{z} <=> $b->{z} } 539 sort { $a->{z} <=> $b->{z} }
341 @{$self->{children}}, $chld 540 @{$self->{children}}, $child
342 ]; 541 ];
343 542
344 $self->{w} = $self->{h} = -1; 543 $child->check_size;
544}
545
546sub children {
547 @{ $_[0]{children} }
548}
549
550sub remove {
551 my ($self, $child) = @_;
552
553 delete $child->{parent};
554 $child->hide;
555
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557
558 $self->check_size;
345 $self->update; 559 $self->update;
346} 560}
347 561
348sub remove { 562sub clear {
349 my ($self, $widget) = @_; 563 my ($self) = @_;
350 564
351 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 565 my $children = delete $self->{children};
566 $self->{children} = [];
352 567
353 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
354} 572}
355 573
356sub find_widget { 574sub find_widget {
357 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
358 576
388 606
389 $class->SUPER::new (children => [$child], %arg) 607 $class->SUPER::new (children => [$child], %arg)
390} 608}
391 609
392sub add { 610sub add {
393 my ($self, $widget) = @_; 611 my ($self, $child) = @_;
394 612
395 $self->{children} = []; 613 $self->{children} = [];
396 614
397 $self->SUPER::add ($widget); 615 $self->SUPER::add ($child);
398} 616}
399 617
400sub remove { 618sub remove {
401 my ($self, $widget) = @_; 619 my ($self, $widget) = @_;
402 620
411sub size_request { 629sub size_request {
412 $_[0]{children}[0]->size_request 630 $_[0]{children}[0]->size_request
413} 631}
414 632
415sub size_allocate { 633sub size_allocate {
416 my ($self, $x, $y, $w, $h) = @_; 634 my ($self, $w, $h) = @_;
417 635
418 $self->_size_allocate ($x, $y, $w, $h) or return;
419
420 $self->{children}[0]->size_allocate (0, 0, $w, $h); 636 $self->{children}[0]->configure (0, 0, $w, $h);
421} 637}
422 638
423############################################################################# 639#############################################################################
424 640
425package CFClient::UI::Window; 641package CFClient::UI::Window;
426 642
427our @ISA = CFClient::UI::Bin::; 643our @ISA = CFClient::UI::Bin::;
428 644
429use SDL::OpenGL; 645use CFClient::OpenGL;
430 646
431sub new { 647sub new {
432 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
433 649
434 my $self = $class->SUPER::new (%arg); 650 my $self = $class->SUPER::new (%arg);
435} 651}
436 652
437sub update { 653sub update {
438 my ($self) = @_; 654 my ($self) = @_;
439 655
440 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
441 $self->render_chld;
442 $self->SUPER::update; 657 $self->SUPER::update;
443} 658}
444 659
445sub render_chld {
446 my ($self) = @_;
447
448 $self->{texture} =
449 CFClient::Texture->new_from_opengl (
450 $self->{w}, $self->{h}, sub { $self->child->draw }
451 );
452}
453
454sub size_allocate { 660sub size_allocate {
455 my ($self, $x, $y, $w, $h) = @_; 661 my ($self, $w, $h) = @_;
456 662
457 $self->_size_allocate ($x, $y, $w, $h) or return;
458
459 $self->child->size_allocate (0, 0, $w, $h); 663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
460 666
461 $self->render_chld; 667sub render_child {
668 my ($self) = @_;
669
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 };
462} 682}
463 683
464sub _draw { 684sub _draw {
465 my ($self) = @_; 685 my ($self) = @_;
466 686
467 my ($w, $h) = ($self->w, $self->h); 687 my ($w, $h) = ($self->w, $self->h);
468 688
469 my $tex = $self->{texture} 689 my $tex = $self->{texture}
470 or return; 690 or return;
691
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
697
698 $tex->draw_quad (0, 0, $w, $h);
699
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D;
702}
703
704#############################################################################
705
706package CFClient::UI::ViewPort;
707
708our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735
736sub new {
737 my $class = shift;
738
739 my $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1],
741 border_bg => [1, 1, 1, 1],
742 border => 0.8,
743 @_
744 );
745
746 $self
747}
748
749sub _draw {
750 my ($self) = @_;
751
752 my ($w, $h) = ($self->{w}, $self->{h});
471 753
472 glEnable GL_BLEND; 754 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glEnable GL_TEXTURE_2D; 756 glEnable GL_TEXTURE_2D;
475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
476 758
477 $tex->draw_quad (0, 0, $w, $h); 759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
478 766
767
768 $self->child->draw;
479 glDisable GL_BLEND; 769 glDisable GL_BLEND;
480 glDisable GL_TEXTURE_2D; 770 glDisable GL_TEXTURE_2D;
481} 771}
482 772
483############################################################################# 773#############################################################################
484 774
485package CFClient::UI::Frame; 775package CFClient::UI::FancyFrame;
486 776
487our @ISA = CFClient::UI::Bin::; 777our @ISA = CFClient::UI::Bin::;
488 778
489use SDL::OpenGL; 779use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784
785sub new {
786 my $class = shift;
787
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1],
793 border => 0.6,
794 can_events => 1,
795 @_
796 );
797
798 $self->{title} &&= new CFClient::UI::Label
799 align => 0,
800 valign => 1,
801 text => $self->{title},
802 fontsize => $self->{border};
803
804 $self
805}
806
807sub border {
808 int $_[0]{border} * $::FONTSIZE
809}
490 810
491sub size_request { 811sub size_request {
492 my ($self) = @_; 812 my ($self) = @_;
493 my $chld = $self->child
494 or return (0, 0);
495 813
496 $chld->move (2, 2); 814 my ($w, $h) = $self->SUPER::size_request;
497 815
498 map { $_ + 4 } $chld->size_request; 816 (
817 $w + $self->border * 2,
818 $h + $self->border * 2,
819 )
499} 820}
500 821
501sub size_allocate { 822sub size_allocate {
502 my ($self, $x, $y, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
503
504 $self->_size_allocate ($x, $y, $w, $h) or return;
505 824
506 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 825 $h -= List::Util::max 0, $self->border * 2;
507} 826 $w -= List::Util::max 0, $self->border * 2;
508 827
509sub _draw { 828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
510 my ($self) = @_; 829 if $self->{title};
511 830
512 my $chld = $self->child; 831 $self->child->configure ($self->border, $self->border, $w, $h);
513
514 my ($w, $h) = $chld->size_request;
515
516 glBegin GL_QUADS;
517 glColor 0, 0, 0;
518 glVertex 0 , 0;
519 glVertex 0 , $h + 4;
520 glVertex $w + 4 , $h + 4;
521 glVertex $w + 4 , 0;
522 glEnd;
523
524 $chld->draw;
525}
526
527#############################################################################
528
529package CFClient::UI::FancyFrame;
530
531our @ISA = CFClient::UI::Bin::;
532
533use SDL::OpenGL;
534
535my @tex =
536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
537 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538
539sub size_request {
540 my ($self) = @_;
541
542 my ($w, $h) =
543 $self->{user_w} && $self->{user_h}
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request);
546
547 $h += $tex[1]->{h};
548 $h += $tex[4]->{h};
549 $w += $tex[2]->{w};
550 $w += $tex[3]->{w};
551
552 ($w, $h)
553}
554
555sub size_allocate {
556 my ($self, $x, $y, $w, $h) = @_;
557
558 $self->_size_allocate ($x, $y, $w, $h) or return;
559
560 $h -= $tex[1]{h};
561 $h -= $tex[4]{h};
562 $w -= $tex[2]{w};
563 $w -= $tex[3]{w};
564
565 $h = $h < 0 ? 0 : $h;
566 $w = $w < 0 ? 0 : $w;
567
568 my $child = $self->child;
569
570 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571} 832}
572 833
573sub button_down { 834sub button_down {
574 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
575 836
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 837 my ($w, $h) = @$self{qw(w h)};
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 838 my $border = $self->border;
578 839
840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
847
848 my $mx = $x < $border;
849 my $my = $y < $border;
581 850
582 $self->{motion} = sub { 851 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
584 853
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
586 856
587 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
588 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
589 $self->update; 859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size;
590 }; 861 };
591 862
592 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
593 && $y >= 0 && $y < $tex[1]{h}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
597 866
598 $self->{motion} = sub { 867 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
600 869
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 870 ($x, $y) = ($ev->{x}, $ev->{y});
602 871
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 872 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update; 873 $self->update;
605 }; 874 };
606 } 875 }
619} 888}
620 889
621sub _draw { 890sub _draw {
622 my ($self) = @_; 891 my ($self) = @_;
623 892
624 my ($w, $h) = ($self->{w}, $self->{h}); 893 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 895
627 glEnable GL_BLEND; 896 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 898 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 900
632 my $top = $tex[1]; 901 my $border = $self->border;
902
903 glColor @{ $self->{border_bg} };
633 $top->draw_quad (0, 0, $w, $top->{h}); 904 $tex[1]->draw_quad (0, 0, $w, $border);
634 905 $tex[3]->draw_quad (0, $border, $border, $ch);
635 my $left = $tex[3]; 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
637
638 my $right = $tex[2];
639 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
640
641 my $bottom = $tex[4];
642 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
643 908
644 my $bg = $tex[0]; 909 my $bg = $tex[0];
645 910
646 glBindTexture GL_TEXTURE_2D, $bg->{name}; 911 # TODO: repeat texture not scale
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
649 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
650
651 my $rep_x = $cw / $bg->{w}; 912 my $rep_x = $cw / $bg->{w};
652 my $rep_y = $ch / $bg->{h}; 913 my $rep_y = $ch / $bg->{h};
653 914
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 915 glColor @{ $self->{bg} };
916
917 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch);
655 921
656 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 923 glDisable GL_BLEND;
658 924
925 $self->{title}->draw if $self->{title};
659 $self->child->draw; 926 $self->child->draw;
660
661} 927}
662 928
663############################################################################# 929#############################################################################
664 930
665package CFClient::UI::Table; 931package CFClient::UI::Table;
666 932
667our @ISA = CFClient::UI::Base::; 933our @ISA = CFClient::UI::Base::;
668 934
669use List::Util qw(max sum); 935use List::Util qw(max sum);
670 936
671use SDL::OpenGL; 937use CFClient::OpenGL;
938
939sub new {
940 my $class = shift;
941
942 $class->SUPER::new (
943 col_expand => [],
944 @_
945 )
946}
672 947
673sub add { 948sub add {
674 my ($self, $x, $y, $chld) = @_; 949 my ($self, $x, $y, $child) = @_;
675 950
951 $child->set_parent ($self);
676 $self->{children}[$y][$x] = $chld; 952 $self->{children}[$y][$x] = $child;
677 $chld->set_parent ($self);
678 953
679 $self->{w} = $self->{h} = -1; 954 $child->check_size;
955}
956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
961# TODO: move to container class maybe? send childs a signal on removal?
962sub clear {
963 my ($self) = @_;
964
965 my @children = $self->children;
966 delete $self->{children};
967
968 for (@children) {
969 delete $_->{parent};
970 $_->hide;
971 }
972
680 $self->update; 973 $self->update;
681} 974}
682 975
683sub get_wh { 976sub get_wh {
684 my ($self) = @_; 977 my ($self) = @_;
690 or next; 983 or next;
691 984
692 for my $x (0 .. $#$row) { 985 for my $x (0 .. $#$row) {
693 my $widget = $row->[$x] 986 my $widget = $row->[$x]
694 or next; 987 or next;
695 my ($w, $h) = $widget->size_request; 988 my ($w, $h) = @$widget{qw(req_w req_h)};
696 989
697 $w[$x] = max $w[$x], $w; 990 $w[$x] = max $w[$x], $w;
698 $h[$y] = max $h[$y], $h; 991 $h[$y] = max $h[$y], $h;
699 } 992 }
700 } 993 }
706 my ($self) = @_; 999 my ($self) = @_;
707 1000
708 my ($ws, $hs) = $self->get_wh; 1001 my ($ws, $hs) = $self->get_wh;
709 1002
710 ( 1003 (
711 (List::Util::sum @$ws), 1004 (sum @$ws),
712 (List::Util::sum @$hs), 1005 (sum @$hs),
713 ) 1006 )
714} 1007}
715 1008
716sub size_allocate { 1009sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
718
719 $self->_size_allocate ($x, $y, $w, $h) or return;
720 1011
721 my ($ws, $hs) = $self->get_wh; 1012 my ($ws, $hs) = $self->get_wh;
722 1013
723 my $req_w = List::Util::sum @$ws; 1014 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 1015 my $req_h = sum @$hs;
1016
1017 # TODO: nicer code && do row_expand
1018 my @col_expand = @{$self->{col_expand}};
1019 @col_expand = (1) x @$ws unless @col_expand;
1020 my $col_expand = (sum @col_expand) || 1;
725 1021
726 # linearly scale sizes 1022 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 1023 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 1024 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1025
1026 CFClient::UI::harmonize $ws;
1027 CFClient::UI::harmonize $hs;
729 1028
730 my $y; 1029 my $y;
731 1030
732 for my $r (0 .. $#{$self->{children}}) { 1031 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 1032 my $row = $self->{children}[$r]
735 1034
736 my $x = 0; 1035 my $x = 0;
737 my $row_h = $hs->[$r]; 1036 my $row_h = $hs->[$r];
738 1037
739 for my $c (0 .. $#$row) { 1038 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 1039 my $col_w = $ws->[$c];
744 1040
1041 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 1042 $widget->configure ($x, $y, $col_w, $row_h);
1043 }
746 1044
747 $x += $col_w; 1045 $x += $col_w;
748 } 1046 }
749 1047
750 $y += $row_h; 1048 $y += $row_h;
794 (List::Util::max map $_->[1], @alloc), 1092 (List::Util::max map $_->[1], @alloc),
795 ) 1093 )
796} 1094}
797 1095
798sub size_allocate { 1096sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804 1098
805 ($h, $w) = ($w, $h); 1099 ($h, $w) = ($w, $h);
806 1100
807 my $children = $self->{children}; 1101 my $children = $self->{children};
808 1102
809 my @h = map +($_->size_request)[0], @$children; 1103 my @h = map $_->{req_w}, @$children;
810 1104
811 my $req_h = List::Util::sum @h; 1105 my $req_h = List::Util::sum @h;
812 1106
813 if ($req_h > $h) { 1107 if ($req_h > $h) {
814 # ah well, not enough space 1108 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 1109 $_ *= $h / $req_h for @h;
816 } else { 1110 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 1111 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 1112 $exp ||= 1;
819 1113
820 for (0 .. $#$children) { 1114 for (0 .. $#$children) {
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1118 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 1119 $h[$_] = $alloc_h;
826 } 1120 }
827 } 1121 }
828 1122
1123 CFClient::UI::harmonize \@h;
1124
829 my $y = 0; 1125 my $y = 0;
830 for (0 .. $#$children) { 1126 for (0 .. $#$children) {
831 my $child = $children->[$_]; 1127 my $child = $children->[$_];
832 my $h = $h[$_]; 1128 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 1129 $child->configure ($y, 0, $h, $w);
834 1130
835 $y += $h; 1131 $y += $h;
836 } 1132 }
1133
1134 1
837} 1135}
838 1136
839############################################################################# 1137#############################################################################
840 1138
841package CFClient::UI::VBox; 1139package CFClient::UI::VBox;
854 (List::Util::sum map $_->[1], @alloc), 1152 (List::Util::sum map $_->[1], @alloc),
855 ) 1153 )
856} 1154}
857 1155
858sub size_allocate { 1156sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 1157 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h) or return;
862
863 return unless $self->{h};
864 1158
865 my $children = $self->{children}; 1159 my $children = $self->{children};
866 1160
867 my @h = map +($_->size_request)[1], @$children; 1161 my @h = map $_->{req_h}, @$children;
868 1162
869 my $req_h = List::Util::sum @h; 1163 my $req_h = List::Util::sum @h;
870 1164
871 if ($req_h > $h) { 1165 if ($req_h > $h) {
872 # ah well, not enough space 1166 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 1167 $_ *= $h / $req_h for @h;
874 } else { 1168 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 1169 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 1170 $exp ||= 1;
877 1171
878 for (0 .. $#$children) { 1172 for (0 .. $#$children) {
880 1174
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1175 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 1176 }
883 } 1177 }
884 1178
1179 CFClient::UI::harmonize \@h;
1180
885 my $y = 0; 1181 my $y = 0;
886 for (0 .. $#$children) { 1182 for (0 .. $#$children) {
887 my $child = $children->[$_]; 1183 my $child = $children->[$_];
888 my $h = $h[$_]; 1184 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 1185 $child->configure (0, $y, $w, $h);
890 1186
891 $y += $h; 1187 $y += $h;
892 } 1188 }
1189
1190 1
893} 1191}
894 1192
895############################################################################# 1193#############################################################################
896 1194
897package CFClient::UI::Label; 1195package CFClient::UI::Label;
898 1196
899our @ISA = CFClient::UI::Base::; 1197our @ISA = CFClient::UI::Base::;
900 1198
901use SDL::OpenGL; 1199use CFClient::OpenGL;
902 1200
903sub new { 1201sub new {
904 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
905 1203
906 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
908 height => $::FONTSIZE, 1206 #font => default_font
1207 fontsize => 1,
909 text => "", 1208 text => "",
910 align => -1, 1209 align => -1,
1210 valign => -1,
911 padding => 2, 1211 padding => 2,
912 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1213 can_events => 0,
913 %arg 1214 %arg
914 ); 1215 );
915 1216
916 $self->set_text ($self->{text}); 1217 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout;
1221 }
1222
1223 $self->set_text (delete $self->{text}) if exists $self->{text};
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
917 1225
918 $self 1226 $self
919} 1227}
920 1228
921sub escape_text { 1229sub escape {
922 local $_ = $_[1]; 1230 local $_ = $_[1];
923 1231
924 s/&/&amp;/g; 1232 s/&/&amp;/g;
925 s/>/&gt;/g; 1233 s/>/&gt;/g;
926 s/</&lt;/g; 1234 s/</&lt;/g;
927 1235
928 $_[1] 1236 $_[1]
929} 1237}
930 1238
1239sub update {
1240 my ($self) = @_;
1241
1242 delete $self->{texture};
1243 $self->SUPER::update;
1244}
1245
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
931sub set_text { 1252sub set_text {
932 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
933 1254
1255 return if $self->{text} eq "T$text";
934 $self->{text} = $text; 1256 $self->{text} = "T$text";
1257
935 $self->{layout}->set_markup ($text); 1258 $self->{layout}->set_text ($text);
936 1259
937 delete $self->{texture}; 1260 delete $self->{texture};
938 $self->update; 1261 $self->update;
1262 $self->check_size;
939} 1263}
940 1264
941sub get_text { 1265sub set_markup {
942 my ($self, $text) = @_; 1266 my ($self, $markup) = @_;
943 1267
944 $self->{text} 1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1271 $self->{layout}->set_markup ($markup);
1272
1273 delete $self->{texture};
1274 $self->update;
1275 $self->check_size;
945} 1276}
946 1277
947sub size_request { 1278sub size_request {
948 my ($self) = @_; 1279 my ($self) = @_;
949 1280
950 $self->{layout}->set_width; 1281 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1);
951 $self->{layout}->set_height ($self->{height}); 1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1284
952 my ($w, $h) = $self->{layout}->size; 1285 my ($w, $h) = $self->{layout}->size;
1286
1287 if (exists $self->{template}) {
1288 $self->{template}->set_font ($self->{font}) if $self->{font};
1289 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1290
1291 my ($w2, $h2) = $self->{template}->size;
1292
1293 $w = List::Util::max $w, $w2;
1294 $h = List::Util::max $h, $h2;
1295 }
953 1296
954 ( 1297 (
955 $w + $self->{padding} * 2, 1298 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1299 $h + $self->{padding} * 2,
957 ) 1300 )
958} 1301}
959 1302
960sub size_allocate { 1303sub size_allocate {
961 my ($self, $x, $y, $w, $h) = @_; 1304 my ($self, $w, $h) = @_;
962
963 $self->_size_allocate ($x, $y, $w, $h) or return;
964 1305
965 delete $self->{texture}; 1306 delete $self->{texture};
966} 1307}
967 1308
968sub update { 1309sub set_fontsize {
969 my ($self) = @_; 1310 my ($self, $fontsize) = @_;
970 1311
1312 $self->{fontsize} = $fontsize;
971 delete $self->{texture}; 1313 delete $self->{texture};
1314 $self->check_size;
972 $self->SUPER::update; 1315 $self->update;
973} 1316}
974 1317
975sub _draw { 1318sub _draw {
976 my ($self) = @_; 1319 my ($self) = @_;
977 1320
978 my $tex = $self->{texture} ||= do { 1321 my $tex = $self->{texture} ||= do {
1322 $self->{layout}->set_font ($self->{font}) if $self->{font};
979 $self->{layout}->set_width ($self->{w}); 1323 $self->{layout}->set_width ($self->{w});
1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
980 new_from_layout CFClient::Texture $self->{layout} 1325 new_from_layout CFClient::Texture $self->{layout}
981 }; 1326 };
982 1327
983 glEnable GL_BLEND; 1328 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1330 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1332
988 glColor @{$self->{fg}}; 1333 glColor @{$self->{fg}};
989 1334
990 my $x = 1335 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1336 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
994 1340
995 $tex->draw_quad ($x, $self->{padding}); 1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy});
996 1348
997 glDisable GL_TEXTURE_2D; 1349 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1350 glDisable GL_BLEND;
999} 1351}
1000 1352
1001############################################################################# 1353#############################################################################
1002 1354
1003package CFClient::UI::Entry; 1355package CFClient::UI::EntryBase;
1004 1356
1005our @ISA = CFClient::UI::Label::; 1357our @ISA = CFClient::UI::Label::;
1006 1358
1007use SDL; 1359use CFClient::OpenGL;
1008use SDL::OpenGL;
1009 1360
1010sub new { 1361sub new {
1011 my $class = shift; 1362 my $class = shift;
1012 1363
1013 $class->SUPER::new ( 1364 $class->SUPER::new (
1014 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1367 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1369 can_hover => 1,
1370 can_focus => 1,
1371 valign => 0,
1372 can_events => 1,
1018 @_ 1373 @_
1019 ) 1374 )
1020} 1375}
1021 1376
1022sub _set_text { 1377sub _set_text {
1023 my ($self, $text) = @_; 1378 my ($self, $text) = @_;
1024 1379
1380 delete $self->{cur_h};
1381
1382 return if $self->{text} eq $text;
1383
1384 delete $self->{texture};
1385
1025 $self->{last_activity} = $::NOW; 1386 $self->{last_activity} = $::NOW;
1026
1027 $self->{text} = $text; 1387 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w});
1029 1388
1030 $text =~ s/./*/g if $self->{hidden}; 1389 $text =~ s/./*/g if $self->{hidden};
1390 $self->{layout}->set_text ("$text ");
1031 1391
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1392 $self->emit (changed => $self->{text});
1393}
1033 1394
1034 $text = substr $text, 0, $self->{cursor}; 1395sub get_text {
1035 utf8::encode $text; 1396 $_[0]{text}
1036
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1038} 1397}
1039 1398
1040sub size_request { 1399sub size_request {
1041 my ($self) = @_; 1400 my ($self) = @_;
1042 1401
1044 1403
1045 ($w + 1, $h) # add 1 for cursor 1404 ($w + 1, $h) # add 1 for cursor
1046} 1405}
1047 1406
1048sub size_allocate { 1407sub size_allocate {
1049 my ($self, $x, $y, $w, $h) = @_; 1408 my ($self, $w, $h) = @_;
1050 1409
1051 $self->SUPER::size_allocate ($x, $y, $w, $h); 1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1052
1053 $self->_set_text ($self->{text});
1054} 1411}
1055 1412
1056sub set_text { 1413sub set_text {
1057 my ($self, $text) = @_; 1414 my ($self, $text) = @_;
1058 1415
1062} 1419}
1063 1420
1064sub key_down { 1421sub key_down {
1065 my ($self, $ev) = @_; 1422 my ($self, $ev) = @_;
1066 1423
1067 my $mod = $ev->key_mod; 1424 my $mod = $ev->{mod};
1068 my $sym = $ev->key_sym; 1425 my $sym = $ev->{sym};
1069
1070 my $uni = $ev->key_unicode; 1426 my $uni = $ev->{unicode};
1071 1427
1072 my $text = $self->get_text; 1428 my $text = $self->get_text;
1073 1429
1074 if ($sym == SDLK_BACKSPACE) { 1430 if ($sym == 8) {
1075 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1431 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1076 } elsif ($sym == SDLK_DELETE) { 1432 } elsif ($sym == 127) {
1077 substr $text, $self->{cursor}, 1, ""; 1433 substr $text, $self->{cursor}, 1, "";
1078 } elsif ($sym == SDLK_LEFT) { 1434 } elsif ($sym == CFClient::SDLK_LEFT) {
1079 --$self->{cursor} if $self->{cursor}; 1435 --$self->{cursor} if $self->{cursor};
1080 } elsif ($sym == SDLK_RIGHT) { 1436 } elsif ($sym == CFClient::SDLK_RIGHT) {
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1437 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1438 } elsif ($sym == CFClient::SDLK_HOME) {
1083 $self->{cursor} = 0; 1439 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1440 } elsif ($sym == CFClient::SDLK_END) {
1085 $self->{cursor} = length $text; 1441 $self->{cursor} = length $text;
1442 } elsif ($sym == 27) {
1443 $self->emit ('escape');
1086 } elsif ($uni) { 1444 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1445 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1446 }
1089 1447
1090 $self->_set_text ($text); 1448 $self->_set_text ($text);
1144 1502
1145 $self->SUPER::_draw; 1503 $self->SUPER::_draw;
1146 1504
1147 #TODO: force update every cursor change :( 1505 #TODO: force update every cursor change :(
1148 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1506 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1507
1508 unless (exists $self->{cur_h}) {
1509 my $text = substr $self->{text}, 0, $self->{cursor};
1510 utf8::encode $text;
1511
1512 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1513 }
1514
1149 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1150 glBegin GL_LINES; 1516 glBegin GL_LINES;
1151 glVertex $self->{cur_x}, $self->{cur_y};
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1517 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1518 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1153 glEnd; 1519 glEnd;
1154 } 1520 }
1155} 1521}
1156 1522
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1523package CFClient::UI::Entry;
1160 1524
1161use strict; 1525our @ISA = CFClient::UI::EntryBase::;
1162 1526
1163use SDL::OpenGL; 1527use CFClient::OpenGL;
1164 1528
1529sub key_down {
1530 my ($self, $ev) = @_;
1531
1532 my $sym = $ev->{sym};
1533
1534 if ($sym == 13) {
1535 unshift @{$self->{history}},
1536 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = '';
1539 $self->emit (activate => $txt);
1540 $self->update;
1541
1542 } elsif ($sym == CFClient::SDLK_UP) {
1543 if ($self->{history_pointer} < 0) {
1544 $self->{history_saveback} = $self->get_text;
1545 }
1546 if (@{$self->{history} || []} > 0) {
1547 $self->{history_pointer}++;
1548 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1549 $self->{history_pointer} = @{$self->{history} || []} - 1;
1550 }
1551 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1552 }
1553
1554 } elsif ($sym == CFClient::SDLK_DOWN) {
1555 $self->{history_pointer}--;
1556 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1557
1558 if ($self->{history_pointer} >= 0) {
1559 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1560 } else {
1561 $self->set_text ($self->{history_saveback});
1562 }
1563
1564 } else {
1565 $self->SUPER::key_down ($ev);
1566 }
1567
1568}
1569
1570#############################################################################
1571
1572package CFClient::UI::Button;
1573
1165our @ISA = CFClient::UI::DrawBG::; 1574our @ISA = CFClient::UI::Label::;
1575
1576use CFClient::OpenGL;
1577
1578my @tex =
1579 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1580 qw(b1_button_active.png);
1166 1581
1167sub new { 1582sub new {
1168 my $class = shift; 1583 my $class = shift;
1169 1584
1585 $class->SUPER::new (
1586 padding => 4,
1587 fg => [1, 1, 1],
1588 bg => [1, 1, 1, 0.2],
1589 active_fg => [0, 0, 1],
1590 can_hover => 1,
1591 align => 0,
1592 valign => 0,
1593 can_events => 1,
1594 @_
1595 )
1596}
1597
1598sub button_up {
1599 my ($self, $ev, $x, $y) = @_;
1600
1601 if ($x >= 0 && $x < $self->{w}
1602 && $y >= 0 && $y < $self->{h}) {
1603 $self->emit ("activate");
1604 }
1605}
1606
1607sub _draw {
1608 my ($self) = @_;
1609
1610 local $self->{fg} = $self->{fg};
1611
1612 if ($GRAB == $self) {
1613 $self->{fg} = $self->{active_fg};
1614 }
1615
1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1;
1621
1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1623
1624 glDisable GL_TEXTURE_2D;
1625 glDisable GL_BLEND;
1626
1627 $self->SUPER::_draw;
1628}
1629
1630#############################################################################
1631
1632package CFClient::UI::CheckBox;
1633
1634our @ISA = CFClient::UI::DrawBG::;
1635
1636my @tex =
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1639
1640use CFClient::OpenGL;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 padding => 2,
1647 fg => [1, 1, 1],
1648 active_fg => [1, 1, 0],
1649 state => 0,
1650 can_hover => 1,
1651 @_
1652 )
1653}
1654
1655sub size_request {
1656 my ($self) = @_;
1657
1658 ($self->{padding} * 2 + 6) x 2
1659}
1660
1661sub button_down {
1662 my ($self, $ev, $x, $y) = @_;
1663
1664 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1665 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1666 $self->{state} = !$self->{state};
1667 $self->emit (changed => $self->{state});
1668 }
1669}
1670
1671sub _draw {
1672 my ($self) = @_;
1673
1674 $self->SUPER::_draw;
1675
1676 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1677
1678 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1679
1680 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681
1682 glEnable GL_BLEND;
1683 glEnable GL_TEXTURE_2D;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685
1686 my $tex = $self->{state} ? $tex[1] : $tex[0];
1687
1688 $tex->draw_quad (0, 0, $s, $s);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692}
1693
1694#############################################################################
1695
1696package CFClient::UI::Image;
1697
1698our @ISA = CFClient::UI::Base::;
1699
1700use CFClient::OpenGL;
1701use Carp qw/confess/;
1702
1703our %loaded_images;
1704
1705sub new {
1706 my $class = shift;
1707
1708 my $self = $class->SUPER::new (can_events => 0, @_);
1709
1710 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1711
1712 $loaded_images{$self->{image}} ||=
1713 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1714
1715 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1716
1717 Scalar::Util::weaken $loaded_images{$self->{image}};
1718
1719 $self->{aspect} = $tex->{w} / $tex->{h};
1720
1721 $self
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 ($self->{tex}->{w}, $self->{tex}->{h})
1728}
1729
1730sub _draw {
1731 my ($self) = @_;
1732
1733 my $tex = $self->{tex};
1734
1735 my ($w, $h) = ($self->{w}, $self->{h});
1736
1737 if ($self->{rot90}) {
1738 glRotate 90, 0, 0, 1;
1739 glTranslate 0, -$self->{w}, 0;
1740
1741 ($w, $h) = ($h, $w);
1742 }
1743
1744 glEnable GL_BLEND;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746 glEnable GL_TEXTURE_2D;
1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748
1749 $tex->draw_quad (0, 0, $w, $h);
1750
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D;
1753}
1754
1755#############################################################################
1756
1757package CFClient::UI::VGauge;
1758
1759our @ISA = CFClient::UI::Base::;
1760
1761use List::Util qw(min max);
1762
1763use CFClient::OpenGL;
1764
1765my %tex = (
1766 food => [
1767 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1768 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1769 ],
1770 grace => [
1771 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1772 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1773 ],
1774 hp => [
1775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1776 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1777 ],
1778 mana => [
1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1780 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1781 ],
1782);
1783
1784# eg. VGauge->new (gauge => 'food'), default gauge: food
1785sub new {
1786 my $class = shift;
1787
1788 my $self = $class->SUPER::new (
1789 type => 'food',
1790 @_
1791 );
1792
1793 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1794
1795 $self
1796}
1797
1798sub size_request {
1799 my ($self) = @_;
1800
1801 #my $tex = $tex{$self->{type}}[0];
1802 #@$tex{qw(w h)}
1803 (0, 0)
1804}
1805
1806sub set_max {
1807 my ($self, $max) = @_;
1808
1809 return if $self->{max_val} == $max;
1810
1811 $self->{max_val} = $max;
1812 $self->update;
1813}
1814
1815sub set_value {
1816 my ($self, $val, $max) = @_;
1817
1818 $self->set_max ($max)
1819 if defined $max;
1820
1821 return if $self->{val} == $val;
1822
1823 $self->{val} = $val;
1824 $self->update;
1825}
1826
1827sub _draw {
1828 my ($self) = @_;
1829
1830 my $tex = $tex{$self->{type}};
1831 my ($t1, $t2, $t3) = @$tex;
1832
1833 my ($w, $h) = ($self->{w}, $self->{h});
1834
1835 if ($self->{vertical}) {
1836 glRotate 90, 0, 0, 1;
1837 glTranslate 0, -$self->{w}, 0;
1838
1839 ($w, $h) = ($h, $w);
1840 }
1841
1842 my $ycut = $self->{val} / ($self->{max_val} || 1);
1843
1844 my $ycut1 = max 0, min 1, $ycut;
1845 my $ycut2 = max 0, min 1, $ycut - 1;
1846
1847 my $h1 = $self->{h} * (1 - $ycut1);
1848 my $h2 = $self->{h} * (1 - $ycut2);
1849
1850 glEnable GL_BLEND;
1851 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1852 glEnable GL_TEXTURE_2D;
1853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1854
1855 glBindTexture GL_TEXTURE_2D, $t1->{name};
1856 glBegin GL_QUADS;
1857 glTexCoord 0 , 0; glVertex 0 , 0;
1858 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1859 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1860 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1861 glEnd;
1862
1863 my $ycut1 = List::Util::min 1, $ycut;
1864 glBindTexture GL_TEXTURE_2D, $t2->{name};
1865 glBegin GL_QUADS;
1866 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1867 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1868 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1869 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1870 glEnd;
1871
1872 if ($t3) {
1873 glBindTexture GL_TEXTURE_2D, $t3->{name};
1874 glBegin GL_QUADS;
1875 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1876 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1877 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1878 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1879 glEnd;
1880 }
1881
1882 glDisable GL_BLEND;
1883 glDisable GL_TEXTURE_2D;
1884}
1885
1886#############################################################################
1887
1888package CFClient::UI::Gauge;
1889
1890our @ISA = CFClient::UI::VBox::;
1891
1892sub new {
1893 my ($class, %arg) = @_;
1894
1895 my $self = $class->SUPER::new (
1896 tooltip => $arg{type},
1897 can_hover => 1,
1898 can_events => 1,
1899 %arg,
1900 );
1901
1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1904 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1905
1906 $self
1907}
1908
1909sub set_fontsize {
1910 my ($self, $fsize) = @_;
1911
1912 $self->{value}->set_fontsize ($fsize);
1913 $self->{max} ->set_fontsize ($fsize);
1914}
1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1923sub set_value {
1924 my ($self, $val, $max) = @_;
1925
1926 $self->set_max ($max)
1927 if defined $max;
1928
1929 $self->{gauge}->set_value ($val, $max);
1930 $self->{value}->set_text ($val);
1931}
1932
1933#############################################################################
1934
1935package CFClient::UI::Slider;
1936
1937use strict;
1938
1939use CFClient::OpenGL;
1940
1941our @ISA = CFClient::UI::DrawBG::;
1942
1943my @tex =
1944 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1945 qw(s1_slider.png s1_slider_bg.png);
1946
1947sub new {
1948 my $class = shift;
1949
1170 # range [value, low, high, page] 1950 # range [value, low, high, page]
1171 1951
1952 # TODO: 0-width page
1953 # TODO: req_w/h are wrong with vertical
1954 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1955 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1957 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1958 range => [0, 0, 100, 10],
1176 req_w => 40, 1959 req_w => 20,
1177 req_h => 10, 1960 req_h => 20,
1178 vertical => 0, 1961 vertical => 0,
1962 can_hover => 1,
1963 inner_pad => 5,
1179 @_ 1964 @_
1180 ); 1965 );
1181 1966
1182 $self 1967 $self
1183} 1968}
1204 if ($GRAB == $self) { 1989 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1990 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206 1991
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1992 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208 1993
1994 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1995 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1996
1997 $x -= $inner_pad_px; # substract the padding
1209 $x = $x * ($hi - $lo) / $w + $lo; 1998 $x = $x * ($hi - $lo) / $inner_w + $lo;
1210 $x = $lo if $x < $lo; 1999 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page; 2000 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x; 2001 $self->{range}[0] = $x;
1213 2002
1214 $self->emit (changed => $x); 2003 $self->emit (changed => $x);
1215 $self->update; 2004 $self->update;
1216 } 2005 }
2006}
2007
2008# the inner_* stuff is for generating a padding for the slider handle,
2009# so that the handle doesn't leave the texture. This calculation isn't 100%
2010# correct propably, but it does the job for now
2011sub _calc_inner_pad_px {
2012 my ($self, $w) = @_;
2013 ($w / 100) * $self->{inner_pad} # % to pixels
1217} 2014}
1218 2015
1219sub _draw { 2016sub _draw {
1220 my ($self) = @_; 2017 my ($self) = @_;
1221 2018
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2032 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2033 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 2034
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2035 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 2036
2037 $hi = $value + 1 if $lo == $hi;
2038
2039 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2040 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2041
1240 $page = int $page * $w / ($hi - $lo); 2042 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 2043 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 2044
1243 $w -= $page; 2045 $w -= $page;
1244 $page &= ~1; 2046 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 2047 glTranslate $page * 0.5, 0, 0;
2048 $page ||= 2;
1246 2049
1247 glColor @$fg;
1248 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h;
1251 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252 glEnd;
1253
1254 my $knob_a = $value - $page * 0.5; 2050 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 2051 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 2052
1257 glBegin GL_QUADS; 2053 glEnable GL_BLEND;
1258 glColor @$fg; 2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 2055 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 2057
1264 if ($knob_a < $knob_b - 2) { 2058 # draw background
1265 glColor @$bg; 2059 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1;
1267 glVertex $knob_a + 1, $h - 1;
1268 glVertex $knob_b - 1, $h - 1;
1269 glVertex $knob_b - 1, 1;
1270 }
1271 glEnd;
1272}
1273 2060
1274############################################################################# 2061 # draw handle
2062 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1275 2063
2064 glDisable GL_BLEND;
2065 glDisable GL_TEXTURE_2D;
2066}
2067
2068#############################################################################
2069
1276package CFClient::UI::MapWidget; 2070package CFClient::UI::TextView;
1277 2071
1278use strict;
1279
1280use List::Util qw(min max);
1281
1282use SDL;
1283use SDL::OpenGL;
1284
1285our @ISA = CFClient::UI::Base::; 2072our @ISA = CFClient::UI::HBox::;
2073
2074use CFClient::OpenGL;
1286 2075
1287sub new { 2076sub new {
1288 my $class = shift; 2077 my $class = shift;
1289 2078
1290 $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1291 z => -1, 2080 fontsize => 1,
1292 list => (glGenLists 1), 2081 can_events => 0,
2082 #font => default_font
1293 @_ 2083 @_,
2084
2085 layout => (new CFClient::Layout),
2086 par => [],
2087 height => 0,
2088 children => [
2089 (new CFClient::UI::Empty expand => 1),
2090 (new CFClient::UI::Slider vertical => 1),
2091 ],
1294 ) 2092 );
1295}
1296 2093
1297sub key_down { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
1298 print "MAPKEYDOWN\n";
1299}
1300 2095
1301sub key_up { 2096 $self
1302} 2097}
1303 2098
1304sub size_request { 2099sub set_fontsize {
2100 my ($self, $fontsize) = @_;
2101
2102 $self->{fontsize} = $fontsize;
2103 $self->reflow;
2104}
2105
2106sub text_height {
2107 my ($self, $text) = @_;
2108
2109 my $layout = $self->{layout};
2110
2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112 $layout->set_width ($self->{children}[0]{w});
2113 $layout->set_text ($text);
1305 ( 2114
1306 1 + 32 * int $::WIDTH / 32, 2115 ($layout->size)[1]
1307 1 + 32 * int $::HEIGHT / 32, 2116}
1308 ) 2117
2118sub reflow {
2119 my ($self) = @_;
2120
2121 $self->{need_reflow}++;
2122 $self->update;
2123}
2124
2125sub size_allocate {
2126 my ($self, $w, $h) = @_;
2127
2128 $self->SUPER::size_allocate ($w, $h);
2129
2130 $self->{layout}->set_font ($self->{font}) if $self->{font};
2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2132 $self->{layout}->set_width ($self->{children}[0]{w});
2133
2134 $self->reflow;
2135}
2136
2137sub add_paragraph {
2138 my ($self, $color, $text) = @_;
2139
2140 #TODO: intelligently "reformat" paragraph
2141
2142 my $height = $self->text_height ($text);
2143
2144 $self->{height} += $height;
2145
2146 push @{$self->{par}}, [$height, $color, $text];
2147
2148 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2149 $self->{children}[1]->update;
1309} 2150}
1310 2151
1311sub update { 2152sub update {
1312 my ($self) = @_; 2153 my ($self) = @_;
1313 2154
1314 $self->{need_update} = 1;
1315 $self->SUPER::update; 2155 $self->SUPER::update;
1316}
1317 2156
1318sub draw { 2157 return unless $self->{h} > 0;
1319 my ($self) = @_;
1320 2158
2159 delete $self->{texture};
2160
2161 $ROOT->on_refresh ($self, sub {
1321 if (delete $self->{need_update}) { 2162 if (delete $self->{need_reflow}) {
1322 glNewList $self->{list}, GL_COMPILE; 2163 my $height = 0;
1323 2164
1324 my $mx = $::CONN->{mapx}; 2165 $height += $_->[0] = $self->text_height ($_->[2])
1325 my $my = $::CONN->{mapy}; 2166 for @{$self->{par}};
1326 2167
1327 my $map = $::CONN->{map}; 2168 $self->{height} = $height;
1328 2169
1329 my ($xofs, $yofs); 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1330 2171
1331 my $sw = 1 + int $::WIDTH / 32; 2172 delete $self->{texture};
1332 my $sh = 1 + int $::HEIGHT / 32;
1333
1334 if ($::CONN->{mapw} > $sw) {
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1336 } else {
1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1338 } 2173 }
1339 2174
1340 if ($::CONN->{maph} > $sh) { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 2176 glClearColor 0, 0, 0, 0;
1342 } else { 2177 glClear GL_COLOR_BUFFER_BIT;
1343 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1344 }
1345 2178
1346 glEnable GL_TEXTURE_2D;
1347 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2181 glEnable GL_TEXTURE_2D;
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1350 2183
1351 my $sw4 = ($sw + 3) & ~3; 2184 my $top = int $self->{children}[1]{range}[0];
1352 my $darkness = "\x00" x ($sw4 * $sh);
1353 2185
1354 for my $x (0 .. $sw - 1) { 2186 my $y0 = $top;
1355 my $row = $map->[$x + $xofs]; 2187 my $y1 = $top + $self->{h};
1356 for my $y (0 .. $sh - 1) {
1357 2188
1358 my $cell = $row->[$y + $yofs] 2189 my $y = 0;
1359 or next;
1360 2190
2191 my $layout = $self->{layout};
2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
2195 for my $par (@{$self->{par}}) {
1361 my $dark = $cell->[0]; 2196 my $h = $par->[0];
1362 if ($dark < 0) { 2197
1363 substr $darkness, $y * $sw4 + $x, 1, chr 224; 2198 if ($y0 < $y + $h && $y < $y1) {
1364 } else { 2199 $layout->set_text ($par->[2]);
1365 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 2200
2201 glColor @{ $par->[1] };
2202 my ($W, $H) = $layout->size;
2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1366 } 2204 }
1367 2205
1368 for my $num (grep $_, @$cell[1,2,3]) { 2206 $y += $h;
1369 my $tex = $::CONN->{face}[$num]{texture} || next;
1370
1371 my ($w, $h) = @$tex{qw(w h)};
1372
1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1374 }
1375 } 2207 }
1376 }
1377 2208
1378# if (1) { # higher quality darkness
1379# $lighting =~ s/(.)/$1$1$1/gs;
1380# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1381#
1382# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1383#
1384# $lighting = $pb->get_pixels;
1385# $lighting =~ s/(.)../$1/gs;
1386# }
1387
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1389
1390 $darkness = new CFClient::Texture
1391 w => $sw4,
1392 h => $sh,
1393 data => $darkness,
1394 internalformat => GL_ALPHA,
1395 format => GL_ALPHA;
1396
1397 glColor 0.45, 0.45, 0.45, 1;
1398 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1399
1400 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND; 2210 glDisable GL_BLEND;
1402
1403 glEndList;
1404 }
1405
1406 glCallList $self->{list};
1407}
1408
1409my %DIR = (
1410 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"],
1412 SDLK_KP6, [3, "east"],
1413 SDLK_KP3, [4, "southeast"],
1414 SDLK_KP2, [5, "south"],
1415 SDLK_KP1, [6, "southwest"],
1416 SDLK_KP4, [7, "west"],
1417 SDLK_KP7, [8, "northwest"],
1418
1419 SDLK_UP, [1, "north"],
1420 SDLK_RIGHT, [3, "east"],
1421 SDLK_DOWN, [5, "south"],
1422 SDLK_LEFT, [7, "west"],
1423);
1424
1425sub key_down {
1426 my ($self, $ev) = @_;
1427
1428 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym;
1430
1431 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire");
1433 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]");
1440 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]");
1442 } 2211 };
1443 } 2212 });
1444} 2213}
1445 2214
1446sub key_up { 2215sub _draw {
1447 my ($self, $ev) = @_; 2216 my ($self) = @_;
1448 2217
1449 my $mod = $ev->key_mod; 2218 glEnable GL_BLEND;
1450 my $sym = $ev->key_sym; 2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224 glDisable GL_TEXTURE_2D;
2225 glDisable GL_BLEND;
1451 2226
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2227 $self->{children}[1]->draw;
1453 $::CONN->send ("command fire_stop"); 2228
1454 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop");
1457 }
1458} 2229}
1459 2230
1460############################################################################# 2231#############################################################################
1461 2232
1462package CFClient::UI::Animator; 2233package CFClient::UI::Animator;
1463 2234
1464use SDL::OpenGL; 2235use CFClient::OpenGL;
1465 2236
1466our @ISA = CFClient::UI::Bin::; 2237our @ISA = CFClient::UI::Bin::;
1467 2238
1468sub moveto { 2239sub moveto {
1469 my ($self, $x, $y) = @_; 2240 my ($self, $x, $y) = @_;
1499 glPopMatrix; 2270 glPopMatrix;
1500} 2271}
1501 2272
1502############################################################################# 2273#############################################################################
1503 2274
1504package CFClient::UI::Toplevel; 2275package CFClient::UI::Flopper;
2276
2277our @ISA = CFClient::UI::Button::;
2278
2279sub new {
2280 my $class = shift;
2281
2282 my $self = $class->SUPER::new (
2283 state => 0,
2284 connect_activate => \&toggle_flopper,
2285 @_
2286 );
2287
2288 if ($self->{state}) {
2289 $self->{state} = 0;
2290 $self->toggle_flopper;
2291 }
2292
2293 $self
2294}
2295
2296sub toggle_flopper {
2297 my ($self) = @_;
2298
2299 # TODO: use animation
2300 if ($self->{state} = !$self->{state}) {
2301 $CFClient::UI::ROOT->add ($self->{other});
2302 $self->{other}->move ($self->coord2global (0, $self->{h}));
2303 $self->emit ("open");
2304 } else {
2305 $CFClient::UI::ROOT->remove ($self->{other});
2306 $self->emit ("close");
2307 }
2308
2309 $self->emit (changed => $self->{state});
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Tooltip;
2315
2316our @ISA = CFClient::UI::Bin::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 @_,
2325 can_events => 0,
2326 )
2327}
2328
2329sub set_markup {
2330 my ($self, $text) = @_;
2331
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2333 $self->{label}->set_markup ($text);
2334 $self->add ($self->{label});
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343
2344 ($w + 4, $h + 4)
2345}
2346
2347sub size_allocate {
2348 my ($self, $w, $h) = @_;
2349
2350 $self->SUPER::size_allocate ($w - 4, $h - 4);
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375;
2358
2359 my ($w, $h) = @$self{qw(w h)};
2360
2361 glColor 1, 0.8, 0.4;
2362 glBegin GL_QUADS;
2363 glVertex 0 , 0;
2364 glVertex 0 , $h;
2365 glVertex $w, $h;
2366 glVertex $w, 0;
2367 glEnd;
2368
2369 glColor 0, 0, 0;
2370 glBegin GL_LINE_LOOP;
2371 glVertex 0 , 0;
2372 glVertex 0 , $h;
2373 glVertex $w, $h;
2374 glVertex $w, 0;
2375 glEnd;
2376
2377 glPopMatrix;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw;
2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::Face;
2386
2387our @ISA = CFClient::UI::Base::;
2388
2389use CFClient::OpenGL;
2390
2391sub new {
2392 my $class = shift;
2393
2394 $class->SUPER::new (
2395 aspect => 1,
2396 @_,
2397 )
2398}
2399
2400sub size_request {
2401 (32, 8)
2402}
2403
2404sub draw {
2405 my ($self) = @_;
2406
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408
2409 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 }
2419}
2420
2421#############################################################################
2422
2423package CFClient::UI::Root;
1505 2424
1506our @ISA = CFClient::UI::Container::; 2425our @ISA = CFClient::UI::Container::;
2426
2427use CFClient::OpenGL;
2428
2429sub check_size {
2430 my ($self) = @_;
2431
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2433}
1507 2434
1508sub size_request { 2435sub size_request {
1509 ($::WIDTH, $::HEIGHT) 2436 ($::WIDTH, $::HEIGHT)
1510} 2437}
1511 2438
1512sub size_allocate { 2439sub configure {
1513 my ($self, $x, $y, $w, $h) = @_; 2440 my ($self, $x, $y, $w, $h) = @_;
1514 2441
1515 $self->_size_allocate ($x, $y, $w, $h); 2442 $self->SUPER::configure ($x, $y, $w, $h);
1516 2443
1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1518 for @{$self->{children}}; 2444 for my $child (@{$self->{children}}) {
1519} 2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1520 2446
1521sub translate { 2447 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H);
2450 }
2451}
2452
2453sub _topleft {
1522 my ($self, $x, $y) = @_; 2454 my ($self, $x, $y) = @_;
1523 2455
1524 ($x, $y) 2456 ($x, $y)
1525} 2457}
1526 2458
1527sub update { 2459sub update {
1528 my ($self) = @_; 2460 my ($self) = @_;
1529 2461
1530 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2462 $self->check_size;
1531 ::refresh (); 2463 ::refresh ();
1532} 2464}
1533 2465
1534sub add { 2466sub add {
1535 my ($self, $widget) = @_; 2467 my ($self, $child) = @_;
1536 2468
2469 # integerize window positions
2470 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y};
2472
1537 $self->SUPER::add ($widget); 2473 $self->SUPER::add ($child);
2474}
1538 2475
1539 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2476sub on_refresh {
2477 my ($self, $id, $cb) = @_;
2478
2479 $self->{refresh_hook}{$id} = $cb;
1540} 2480}
1541 2481
1542sub draw { 2482sub draw {
1543 my ($self) = @_; 2483 my ($self) = @_;
1544 2484
2485 while (my $rcb = delete $self->{refresh_hook}) {
2486 $_->() for values %$rcb;
2487 }
2488
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT;
2492
2493 glMatrixMode GL_PROJECTION;
2494 glLoadIdentity;
2495 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2496 glMatrixMode GL_MODELVIEW;
2497 glLoadIdentity;
2498
1545 $self->_draw; 2499 $self->_draw;
1546} 2500}
1547 2501
1548############################################################################# 2502#############################################################################
1549 2503
1550package CFClient::UI; 2504package CFClient::UI;
1551 2505
2506$ROOT = new CFClient::UI::Root;
1552$TOPLEVEL = new CFClient::UI::Toplevel; 2507$TOOLTIP = new CFClient::UI::Tooltip;
1553 2508
15541 25091
1555 2510

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines