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.73 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC

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

Diff Legend

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