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

Diff Legend

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