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.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.100 by elmex, Fri Apr 14 11:32:22 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
107}
108 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
109# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
112 141
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
118 147
119 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
120 150
121 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus; 152 $focus->update if $focus;
123 $FOCUS->update; 153 $FOCUS->update;
124} 154}
… …
155 return unless $self->{h} && $self->{w}; 185 return unless $self->{h} && $self->{w};
156 186
157 glPushMatrix; 187 glPushMatrix;
158 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
159 $self->_draw; 189 $self->_draw;
160 if ($self == $HOVER) { 190 glPopMatrix;
161 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
162 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
163 glBegin GL_QUADS; 198 glBegin GL_QUADS;
164 glVertex 0 , 0; 199 glVertex $x , $y;
165 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
166 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
167 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
168 glEnd; 203 glEnd;
169 glDisable GL_BLEND; 204 glDisable GL_BLEND;
170 } 205 }
171 glPopMatrix;
172} 206}
173 207
174sub _draw { 208sub _draw {
175 my ($self) = @_; 209 my ($self) = @_;
176 210
177 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
178}
179
180sub bbox {
181 my ($self) = @_;
182 my ($w, $h) = $self->size_request;
183 (
184 $self->{x},
185 $self->{y},
186 $self->{x} = $w,
187 $self->{y} = $h
188 )
189} 212}
190 213
191sub find_widget { 214sub find_widget {
192 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
193 216
… …
196 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
197 220
198 () 221 ()
199} 222}
200 223
201sub del_parent { $_[0]->{parent} = undef }
202
203sub set_parent { 224sub set_parent {
204 my ($self, $par) = @_; 225 my ($self, $par) = @_;
205 226
206 $self->{parent} = $par; 227 $self->{parent} = $par;
207 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
216 237
217 $self->{parent}->update 238 $self->{parent}->update
218 if $self->{parent}; 239 if $self->{parent};
219} 240}
220 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
221sub DESTROY { 255sub DESTROY {
222 my ($self) = @_; 256 my ($self) = @_;
223 257
224 #$self->deactivate; 258 #$self->deactivate;
225} 259}
226 260
227############################################################################# 261#############################################################################
228 262
229package CFClient::Widget::DrawBG; 263package CFClient::UI::DrawBG;
230 264
231our @ISA = CFClient::Widget::; 265our @ISA = CFClient::UI::Base::;
232 266
233use strict; 267use strict;
234use SDL::OpenGL; 268use SDL::OpenGL;
235 269
236sub new { 270sub new {
237 my $class = shift; 271 my $class = shift;
238 272
239 # range [value, low, high, page] 273 # range [value, low, high, page]
240 274
241 $class->SUPER::new ( 275 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4], 276 bg => [0, 0, 0, 0.2],
243 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
244 @_ 278 @_
245 ) 279 )
246} 280}
247 281
248sub _draw { 282sub _draw {
249 my ($self) = @_; 283 my ($self) = @_;
250 284
251 my ($w, $h) = @$self{qw(w h)}; 285 my ($w, $h) = @$self{qw(w h)};
252 286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
254 glBegin GL_QUADS; 291 glBegin GL_QUADS;
255 glVertex 0 , 0; 292 glVertex 0 , 0;
256 glVertex 0 , $h; 293 glVertex 0 , $h;
257 glVertex $w, $h; 294 glVertex $w, $h;
258 glVertex $w, 0; 295 glVertex $w, 0;
259 glEnd; 296 glEnd;
260}
261 297
262############################################################################# 298 glDisable GL_BLEND;
299}
263 300
301#############################################################################
302
264package CFClient::Widget::Empty; 303package CFClient::UI::Empty;
265 304
266our @ISA = CFClient::Widget::; 305our @ISA = CFClient::UI::Base::;
267 306
268sub size_request { 307sub size_request {
269 (0, 0) 308 (0, 0)
270} 309}
271 310
272sub draw { } 311sub draw { }
273 312
274############################################################################# 313#############################################################################
275 314
276package CFClient::Widget::Container; 315package CFClient::UI::Container;
277 316
278our @ISA = CFClient::Widget::; 317our @ISA = CFClient::UI::Base::;
279 318
280sub new { 319sub new {
281 my ($class, %arg) = @_; 320 my ($class, %arg) = @_;
282 321
283 my $children = delete $arg{children} || []; 322 my $children = delete $arg{children} || [];
… …
287 326
288 $self 327 $self
289} 328}
290 329
291sub add { 330sub add {
292 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
293 332
294 $chld->{expand} = $expand;
295 $chld->set_parent ($self); 333 $chld->set_parent ($self);
296 334
297 $self->{children} = [ 335 $self->{children} = [
298 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
299 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
300 ]; 338 ];
301 339
302 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
303 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
304} 342}
305 343
306sub remove { 344sub remove {
307 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
308 346
309 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
310 348
311 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
312} 350}
313 351
314sub find_widget { 352sub find_widget {
315 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
316 354
… …
333 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
334} 372}
335 373
336############################################################################# 374#############################################################################
337 375
338package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
339 377
340our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
341 379
342sub new { 380sub new {
343 my ($class, %arg) = @_; 381 my ($class, %arg) = @_;
344 382
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
346 384
347 $class->SUPER::new (children => [$child], %arg) 385 $class->SUPER::new (children => [$child], %arg)
348} 386}
349 387
350sub add { 388sub add {
… …
358sub remove { 396sub remove {
359 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
360 398
361 $self->SUPER::remove ($widget); 399 $self->SUPER::remove ($widget);
362 400
363 $self->{children} = [new CFClient::Widget::Empty] 401 $self->{children} = [new CFClient::UI::Empty]
364 unless @{$self->{children}}; 402 unless @{$self->{children}};
365} 403}
366 404
367sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
368 406
369sub size_request { 407sub size_request {
370 $_[0]{children}[0]->size_request 408 $_[0]{children}[0]->size_request
371} 409}
372 410
373sub size_allocate { 411sub size_allocate {
374 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
375 413
376 return unless $self->{w} != $w || $self->{h} != $h; 414 $self->_size_allocate ($x, $y, $w, $h) or return;
377 415
378 $self->SUPER::size_allocate ($w, $h);
379 $self->{children}[0]->size_allocate ($w, $h); 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
380} 417}
381 418
382############################################################################# 419#############################################################################
383 420
384package CFClient::Widget::Window; 421package CFClient::UI::Window;
385 422
386our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
387 424
388use SDL::OpenGL; 425use SDL::OpenGL;
389 426
390sub new { 427sub new {
391 my ($class, %arg) = @_; 428 my ($class, %arg) = @_;
… …
409 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
410 ); 447 );
411} 448}
412 449
413sub size_allocate { 450sub size_allocate {
414 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
415 452
416 return unless $self->{w} != $w || $self->{h} != $h; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
417 454
418 $self->{w} = $w;
419 $self->{h} = $h;
420
421 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
422 456
423 $self->render_chld; 457 $self->render_chld;
424} 458}
425 459
426sub _draw { 460sub _draw {
… …
430 464
431 my $tex = $self->{texture} 465 my $tex = $self->{texture}
432 or return; 466 or return;
433 467
434 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
435 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
437 472
438 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
439 474
… …
441 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
442} 477}
443 478
444############################################################################# 479#############################################################################
445 480
446package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
447 482
448our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
449 484
450use SDL::OpenGL; 485use SDL::OpenGL;
451 486
452sub size_request { 487sub size_request {
453 my ($self) = @_; 488 my ($self) = @_;
… …
458 493
459 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
460} 495}
461 496
462sub size_allocate { 497sub size_allocate {
463 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
464 499
465 return unless $self->{w} != $w || $self->{h} != $h; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
466 501
467 $self->{w} = $w;
468 $self->{h} = $h;
469
470 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
471 $self->child->move (2, 2);
472} 503}
473 504
474sub _draw { 505sub _draw {
475 my ($self) = @_; 506 my ($self) = @_;
476 507
… …
489 $chld->draw; 520 $chld->draw;
490} 521}
491 522
492############################################################################# 523#############################################################################
493 524
494package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
495 526
496our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
497 528
498use SDL::OpenGL; 529use SDL::OpenGL;
499 530
500my @tex = 531my @tex =
501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
503 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
504sub size_request { 548sub size_request {
505 my ($self) = @_; 549 my ($self) = @_;
506 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
507 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
508 554
509 $h += $tex[1]->{height}; 555 (
510 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
511 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
512 $w += $tex[3]->{width}; 558 )
513
514 ($w, $h)
515} 559}
516 560
517sub size_allocate { 561sub size_allocate {
518 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
519 563
520 return unless $self->{w} != $w || $self->{h} != $h; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
521 565
522 $self->SUPER::size_allocate ($w, $h); 566 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2;
523 568
524 $h -= $tex[1]->{height}; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
525 $h -= $tex[4]->{height}; 570}
526 $w -= $tex[2]->{width};
527 $w -= $tex[3]->{width};
528 571
529 $h = $h < 0 ? 0 : $h; 572sub button_down {
530 $w = $w < 0 ? 0 : $w; 573 my ($self, $ev, $x, $y) = @_;
531 574
532 my $child = $self->child; 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
533 577
534 $child->size_allocate ($w, $h); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
535 $child->move ($tex[3]->{width}, $tex[1]->{height}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
536} 618}
537 619
538sub _draw { 620sub _draw {
539 my ($self) = @_; 621 my ($self) = @_;
540 622
541 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
542 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
543 625
544 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
545 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
548 630
549 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
550 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
551 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
552 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
554
555 my $right = $tex[2];
556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
557
558 my $bottom = $tex[4];
559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
560 636
561 my $bg = $tex[0]; 637 my $bg = $tex[0];
562 glBindTexture GL_TEXTURE_2D, $bg->{name};
563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
566 638
639 # TODO: repeat texture not scale
567 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
568 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
569 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
571 649
650 glDisable GL_TEXTURE_2D;
572 glDisable GL_BLEND; 651 glDisable GL_BLEND;
573 glDisable GL_TEXTURE_2D;
574 652
575 $self->child->draw; 653 $self->child->draw;
576
577} 654}
578 655
579############################################################################# 656#############################################################################
580 657
581package CFClient::Widget::Table; 658package CFClient::UI::Table;
582 659
583our @ISA = CFClient::Widget::Bin::; 660our @ISA = CFClient::UI::Base::;
661
662use List::Util qw(max sum);
584 663
585use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
586 674
587sub add { 675sub add {
588 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
589 my $old_chld = $self->{children}[$y][$x];
590 677
591 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
592 $chld->set_parent ($self); 679 $chld->set_parent ($self);
680
681 $self->{w} = $self->{h} = -1;
593 $self->update; 682 $self->update;
594} 683}
595 684
596sub max_row_height { 685sub get_wh {
597 my ($self, $row) = @_; 686 my ($self) = @_;
598 687
599 my $hs = 0; 688 my (@w, @h);
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 689
690 for my $y (0 .. $#{$self->{children}}) {
601 my $c = $self->{children}->[$row]->[$xi]; 691 my $row = $self->{children}[$y]
602 if ($c) { 692 or next;
693
694 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x]
696 or next;
603 my ($w, $h) = $c->size_request; 697 my ($w, $h) = $widget->size_request;
604 if ($hs < $h) { $hs = $h } 698
699 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h;
605 } 701 }
606 } 702 }
607 return $hs;
608}
609 703
610sub max_col_width { 704 (\@w, \@h)
705}
706
707sub size_request {
611 my ($self, $col) = @_; 708 my ($self) = @_;
612 709
710 my ($ws, $hs) = $self->get_wh;
711
712 (
713 (sum @$ws),
714 (sum @$hs),
715 )
716}
717
718sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722
723 my ($ws, $hs) = $self->get_wh;
724
725 my $req_w = sum @$ws;
726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
732
733 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
736
737 my $y;
738
739 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r]
741 or next;
742
613 my $ws = 0; 743 my $x = 0;
614 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 744 my $row_h = $hs->[$r];
615 my $c = ($self->{children}->[$yi] || [])->[$col]; 745
616 if ($c) { 746 for my $c (0 .. $#$row) {
617 my ($w, $h) = $c->size_request; 747 my $col_w = $ws->[$c];
618 if ($ws < $w) { $ws = $w } 748
749 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
752
753 $x += $col_w;
619 } 754 }
755
756 $y += $row_h;
620 } 757 }
621 return $ws; 758
622} 759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
623 792
624sub size_request { 793sub size_request {
625 my ($self) = @_; 794 my ($self) = @_;
626 795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808
627 my ($hs, $ws) = (0, 0); 809 ($h, $w) = ($w, $h);
628 810
629 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 811 my $children = $self->{children};
630 $hs += $self->max_row_height ($yi);
631 }
632 812
633 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 813 my @h = map +($_->size_request)[0], @$children;
634 my $wm = 0; 814
635 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 815 my $req_h = List::Util::sum @h;
636 $wm += $self->max_col_width ($xi) 816
817 if ($req_h > $h) {
818 # ah well, not enough space
819 $_ *= $h / $req_h for @h;
820 } else {
821 my $exp = List::Util::sum map $_->{expand}, @$children;
822 $exp ||= 1;
823
824 for (0 .. $#$children) {
825 my $child = $children->[$_];
826
827 my $alloc_h = $h[$_];
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h;
637 } 830 }
638 if ($ws < $wm) { $ws = $wm }
639 } 831 }
640
641 return ($ws, $hs);
642}
643
644sub _draw {
645 my ($self) = @_;
646 832
647 my $y = 0; 833 my $y = 0;
648 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 834 for (0 .. $#$children) {
835 my $child = $children->[$_];
649 my $x = 0; 836 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w);
650 838
651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 839 $y += $h;
652
653 my $c = $self->{children}->[$yi]->[$xi];
654 if ($c) {
655 $c->move ($x, $y, 0); #TODO: Move to size_request
656 $c->draw if $c;
657 }
658
659 $x += $self->max_col_width ($xi);
660 }
661
662 $y += $self->max_row_height ($yi);
663 } 840 }
664} 841}
665 842
666############################################################################# 843#############################################################################
667 844
668package CFClient::Widget::VBox; 845package CFClient::UI::VBox;
669 846
847# TODO: wrap into common Box base class
848
670our @ISA = CFClient::Widget::Container::; 849our @ISA = CFClient::UI::Container::;
671
672use SDL::OpenGL;
673 850
674sub size_request { 851sub size_request {
675 my ($self) = @_; 852 my ($self) = @_;
676 853
677 my @alloc = map [$_->size_request], @{$self->{children}}; 854 my @alloc = map [$_->size_request], @{$self->{children}};
… …
681 (List::Util::sum map $_->[1], @alloc), 858 (List::Util::sum map $_->[1], @alloc),
682 ) 859 )
683} 860}
684 861
685sub size_allocate { 862sub size_allocate {
686 my ($self, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
687 864
688 return unless $self->{w} != $w || $self->{h} != $h; 865 $self->_size_allocate ($x, $y, $w, $h);
689
690 $self->{w} = $w;
691 $self->{h} = $h;
692
693 return unless $self->{h};
694 866
695 my $children = $self->{children}; 867 my $children = $self->{children};
696 868
697 my @h = map +($_->size_request)[1], @$children; 869 my @h = map +($_->size_request)[1], @$children;
698 870
699 my $req_h = List::Util::sum @h; 871 my $req_h = List::Util::sum @h;
700 872
701 if ($req_h > $h) { 873 if ($req_h > $h) {
702 # ah well, not enough space 874 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h; 875 $_ *= $h / $req_h for @h;
704 } else { 876 } else {
705 my @exp = grep $_->{expand}, @$children; 877 my $exp = List::Util::sum map $_->{expand}, @$children;
706 @exp = @$children unless @exp; 878 $exp ||= 1;
707 879
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) { 880 for (0 .. $#$children) {
711 my $child = $children->[$_]; 881 my $child = $children->[$_];
712 882
713 my $alloc_h = $h[$_]; 883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
716 } 884 }
717 } 885 }
718 886
719 my $y = 0; 887 my $y = 0;
720 for (0 .. $#$children) { 888 for (0 .. $#$children) {
721 my $child = $children->[$_]; 889 my $child = $children->[$_];
722 my $h = $h[$_]; 890 my $h = $h[$_];
723 $child->move (0, $y);
724 $child->size_allocate ($w, $h); 891 $child->size_allocate (0, $y, $w, $h);
725 892
726 $y += $h; 893 $y += $h;
727 } 894 }
728} 895}
729 896
730############################################################################# 897#############################################################################
731 898
732package CFClient::Widget::Label; 899package CFClient::UI::Label;
733 900
734our @ISA = CFClient::Widget::; 901our @ISA = CFClient::UI::Base::;
735 902
736use SDL::OpenGL; 903use SDL::OpenGL;
737 904
738sub new { 905sub new {
739 my ($class, %arg) = @_; 906 my ($class, %arg) = @_;
740 907
741 my $self = $class->SUPER::new ( 908 my $self = $class->SUPER::new (
742 fg => [1, 1, 1], 909 fg => [1, 1, 1],
743 height => $::FONTSIZE, 910 height => $::FONTSIZE,
744 text => "", 911 text => "",
912 align => -1,
913 padding => 2,
745 layout => new CFClient::Layout, 914 layout => new CFClient::Layout,
746 %arg 915 %arg
747 ); 916 );
748 917
749 $self->set_text ($self->{text}); 918 $self->set_text ($self->{text});
750 919
… …
766 935
767 $self->{text} = $text; 936 $self->{text} = $text;
768 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
769 938
770 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
771 $self->update; 941 $self->update;
772} 942}
773 943
774sub get_text { 944sub get_text {
775 my ($self, $text) = @_; 945 my ($self, $text) = @_;
… …
780sub size_request { 950sub size_request {
781 my ($self) = @_; 951 my ($self) = @_;
782 952
783 $self->{layout}->set_width; 953 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height}); 954 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size 955 my ($w, $h) = $self->{layout}->size;
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 956
787# ( 957 (
788# $self->{texture}{width}, 958 $w + $self->{padding} * 2,
789# $self->{texture}{height}, 959 $h + $self->{padding} * 2,
790# ) 960 )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796} 961}
797 962
798sub size_allocate { 963sub size_allocate {
799 my ($self, $w, $h) = @_; 964 my ($self, $x, $y, $w, $h) = @_;
800 965
801 return unless $self->{w} != $w || $self->{h} != $h; 966 $self->_size_allocate ($x, $y, $w, $h) or return;
802 967
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture}; 968 delete $self->{texture};
805} 969}
806 970
807sub update { 971sub update {
808 my ($self) = @_; 972 my ($self) = @_;
… …
814sub _draw { 978sub _draw {
815 my ($self) = @_; 979 my ($self) = @_;
816 980
817 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w}); 982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
819 new_from_layout CFClient::Texture $self->{layout}; 984 new_from_layout CFClient::Texture $self->{layout}
820 }; 985 };
821 986
822 glEnable GL_BLEND; 987 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
823 glEnable GL_TEXTURE_2D; 989 glEnable GL_TEXTURE_2D;
824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 991
827 glColor @{$self->{fg}}; 992 glColor @{$self->{fg}};
828 993
994 my $x =
995 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5;
998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
829 $tex->draw_quad (0, 0); 1000 $tex->draw_quad (0, 0);
830 1001
1002 glDisable GL_TEXTURE_2D;
831 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
832 glDisable GL_TEXTURE_2D;
833} 1004}
834 1005
835############################################################################# 1006#############################################################################
836 1007
837package CFClient::Widget::Entry; 1008package CFClient::UI::Entry;
838 1009
839our @ISA = CFClient::Widget::Label::; 1010our @ISA = CFClient::UI::Label::;
840 1011
841use SDL; 1012use SDL;
842use SDL::OpenGL; 1013use SDL::OpenGL;
843 1014
844sub new { 1015sub new {
845 my $class = shift; 1016 my $class = shift;
846 1017
847 $class->SUPER::new ( 1018 $class->SUPER::new (
848 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4], 1020 bg => [0, 0, 0, 0.2],
850 active_bg => [1, 1, 1], 1021 active_bg => [1, 1, 1, 0.5],
851 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
852 @_ 1025 @_
853 ) 1026 )
854} 1027}
855 1028
856sub _set_text { 1029sub _set_text {
857 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
858 1031
1032 my $old_text = $self->{text};
1033
859 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
860 1035
861 $self->{text} = $text; 1036 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w}); 1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
863 $self->{layout}->set_markup ($self->escape_text ($text)); 1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
864 1043
865 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text; 1045 utf8::encode $text;
867 1046
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
869} 1051}
870 1052
871sub size_request { 1053sub size_request {
872 my ($self) = @_; 1054 my ($self) = @_;
873 1055
… …
875 1057
876 ($w + 1, $h) # add 1 for cursor 1058 ($w + 1, $h) # add 1 for cursor
877} 1059}
878 1060
879sub size_allocate { 1061sub size_allocate {
880 my ($self, $w, $h) = @_; 1062 my ($self, $x, $y, $w, $h) = @_;
881 1063
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h); 1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
885 1065
886 $self->_set_text ($self->{text}); 1066 $self->_set_text ($self->{text});
887} 1067}
888 1068
889sub set_text { 1069sub set_text {
… …
910 substr $text, $self->{cursor}, 1, ""; 1090 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) { 1091 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor}; 1092 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) { 1093 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
915 } elsif ($uni) { 1099 } elsif ($uni) {
916 substr $text, $self->{cursor}++, 0, chr $uni; 1100 substr $text, $self->{cursor}++, 0, chr $uni;
917 } 1101 }
918 1102
919 $self->_set_text ($text); 1103 $self->_set_text ($text);
… …
934 $self->SUPER::button_down ($ev, $x, $y); 1118 $self->SUPER::button_down ($ev, $x, $y);
935 1119
936 my $idx = $self->{layout}->xy_to_index ($x, $y); 1120 my $idx = $self->{layout}->xy_to_index ($x, $y);
937 1121
938 # byte-index to char-index 1122 # byte-index to char-index
939 my $text = $self->{layout}; 1123 my $text = $self->{text};
940 utf8::encode $text; 1124 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx; 1125 $self->{cursor} = length substr $text, 0, $idx;
942 1126
943 $self->_set_text ($self->{text}); 1127 $self->_set_text ($self->{text});
944 $self->update; 1128 $self->update;
… …
959 $self->{fg} = $self->{active_fg}; 1143 $self->{fg} = $self->{active_fg};
960 } else { 1144 } else {
961 glColor @{$self->{bg}}; 1145 glColor @{$self->{bg}};
962 } 1146 }
963 1147
1148 glEnable GL_BLEND;
1149 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
964 glBegin GL_QUADS; 1150 glBegin GL_QUADS;
965 glVertex 0 , 0; 1151 glVertex 0 , 0;
966 glVertex 0 , $self->{h}; 1152 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h}; 1153 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0; 1154 glVertex $self->{w}, 0;
969 glEnd; 1155 glEnd;
1156 glDisable GL_BLEND;
970 1157
971 $self->SUPER::_draw; 1158 $self->SUPER::_draw;
972 1159
973 #TODO: force update every cursor change :( 1160 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1161 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1165 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd; 1166 glEnd;
980 } 1167 }
981} 1168}
982 1169
983############################################################################# 1170package CFClient::UI::LineEntry;
984 1171
985package CFClient::Widget::Slider; 1172our @ISA = CFClient::UI::Entry::;
986 1173
987use strict; 1174use SDL;
988
989use SDL::OpenGL; 1175use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991 1176
992our @ISA = CFClient::Widget::DrawBG::; 1177sub key_down {
993
994sub size_request {
995 my ($self) = @_; 1178 my ($self, $ev) = @_;
996 1179
997 my $w = 20; 1180 my $sym = $ev->key_sym;
998 my $h = 10;
999 1181
1000 $self->{vertical} ? ($h, $w) : ($w, $h) 1182 if ($sym == SDLK_RETURN) {
1183 $self->emit (activate => $self->get_text);
1184 $self->update;
1185
1186 } else {
1187 $self->SUPER::key_down ($ev);
1188 }
1189
1001} 1190}
1191
1192#############################################################################
1193
1194package CFClient::UI::Button;
1195
1196our @ISA = CFClient::UI::Label::;
1197
1198use SDL;
1199use SDL::OpenGL;
1200
1201my @tex =
1202 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1203 qw(b1_button_active.png);
1002 1204
1003sub new { 1205sub new {
1004 my $class = shift; 1206 my $class = shift;
1005 1207
1208 $class->SUPER::new (
1209 padding => 4,
1210 fg => [1, 1, 1],
1211 bg => [1, 1, 1, 0.2],
1212 active_fg => [1, 1, 0],
1213 can_hover => 1,
1214 @_
1215 )
1216}
1217
1218sub button_up {
1219 my ($self, $ev, $x, $y) = @_;
1220
1221 if ($x >= 0 && $x < $self->{w}
1222 && $y >= 0 && $y < $self->{h}) {
1223 $self->emit ("activate");
1224 }
1225}
1226
1227sub _draw {
1228 my ($self) = @_;
1229
1230 local $self->{fg} = $self->{fg};
1231 my $tex = $tex[0];
1232
1233 glEnable GL_BLEND;
1234 glEnable GL_TEXTURE_2D;
1235 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1236
1237 if ($GRAB == $self) {
1238 $self->{fg} = $self->{active_fg};
1239 }
1240
1241 glBindTexture GL_TEXTURE_2D, $tex->{name};
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243
1244 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1245
1246 glDisable GL_TEXTURE_2D;
1247 glDisable GL_BLEND;
1248
1249 $self->SUPER::_draw;
1250}
1251
1252#############################################################################
1253
1254package CFClient::UI::CheckBox;
1255
1256our @ISA = CFClient::UI::DrawBG::;
1257
1258use SDL;
1259use SDL::OpenGL;
1260
1261sub new {
1262 my $class = shift;
1263
1264 $class->SUPER::new (
1265 padding => 2,
1266 fg => [1, 1, 1],
1267 active_fg => [1, 1, 0],
1268 state => 0,
1269 can_hover => 1,
1270 @_
1271 )
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 ($self->{padding} * 2 + 6) x 2
1278}
1279
1280sub size_allocate {
1281 my ($self, $x, $y, $w, $h) = @_;
1282
1283 $self->_size_allocate ($x, $y, $w, $h);
1284}
1285
1286sub button_down {
1287 my ($self, $ev, $x, $y) = @_;
1288
1289 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1290 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1291 $self->{state} = !$self->{state};
1292 $self->emit (changed => $self->{state});
1293 }
1294}
1295
1296sub _draw {
1297 my ($self) = @_;
1298
1299 $self->SUPER::_draw;
1300
1301 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1302
1303 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1304
1305 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1306
1307 glBegin GL_LINE_LOOP;
1308 glVertex 0 , 0;
1309 glVertex 0 , $s;
1310 glVertex $s, $s;
1311 glVertex $s, 0;
1312 glEnd;
1313
1314 if ($self->{state}) {
1315 glBegin GL_LINES;
1316 glVertex 0 , 0;
1317 glVertex $s, $s;
1318 glVertex $s, 0;
1319 glVertex 0 , $s;
1320 glEnd;
1321 }
1322}
1323
1324#############################################################################
1325
1326package CFClient::UI::Slider;
1327
1328use strict;
1329
1330use SDL::OpenGL;
1331
1332our @ISA = CFClient::UI::DrawBG::;
1333
1334my @tex =
1335 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1336 qw(s1_slider.png s1_slider_bg.png);
1337
1338sub new {
1339 my $class = shift;
1340
1006 # range [value, low, high, page] 1341 # range [value, low, high, page]
1007 1342
1343 # TODO: 0-width page
1344 # TODO: req_w/h are wrong with vertical
1345 # TODO: calculations are off
1008 $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1009 fg => [1, 1, 1], 1347 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10], 1349 range => [0, 0, 100, 10],
1350 req_w => 40,
1351 req_h => 13,
1012 vertical => 0, 1352 vertical => 0,
1353 can_hover => 1,
1013 @_ 1354 @_
1014 ) 1355 );
1356
1357 $self
1358}
1359
1360sub size_request {
1361 my ($self) = @_;
1362
1363 my $w = $self->{req_w};
1364 my $h = $self->{req_h};
1365
1366 $self->{vertical} ? ($h, $w) : ($w, $h)
1015} 1367}
1016 1368
1017sub button_down { 1369sub button_down {
1018 my ($self, $ev, $x, $y) = @_; 1370 my ($self, $ev, $x, $y) = @_;
1019 1371
… …
1025 my ($self, $ev, $x, $y) = @_; 1377 my ($self, $ev, $x, $y) = @_;
1026 1378
1027 if ($GRAB == $self) { 1379 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1380 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029 1381
1382 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1383
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo; 1384 $x = $x * ($hi - $lo) / $w + $lo;
1031 $x = $lo if $x < $lo; 1385 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page; 1386 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x; 1387 $self->{range}[0] = $x;
1034 1388
1035 $self->{changed}($x) if $self->{changed}; 1389 $self->emit (changed => $x);
1036 $self->update; 1390 $self->update;
1037 } 1391 }
1038} 1392}
1039 1393
1040sub _draw { 1394sub _draw {
1041 my ($self) = @_; 1395 my ($self) = @_;
1042 1396
1043 $self->SUPER::_draw (); 1397 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046 1398
1047 my ($w, $h) = @$self{qw(w h)}; 1399 my ($w, $h) = @$self{qw(w h)};
1048 1400
1049 if ($self->{vertical}) { 1401 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider 1402 # draw a vertical slider like a rotated horizontal slider
1051 1403
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1; 1404 glRotate 90, 0, 0, 1;
1405 glTranslate 0, -$self->{w}, 0;
1054 1406
1055 ($w, $h) = ($h, $w); 1407 ($w, $h) = ($h, $w);
1056 } 1408 }
1057 1409
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1410 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1411 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060 1412
1061 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1413 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062 1414
1415 # the inner_* stuff is for generating a padding for the slider handle,
1416 # so that the handle doesn't leave the texture. This calculation isn't 100%
1417 # correct propably, but it does the job for now
1418 my $inner_pad = 5; # 5% of width for slider bg texture border
1419 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421
1063 $page = int $page * $w / ($hi - $lo); 1422 $page = int $page * $inner_w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo); 1423 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1065 1424
1066 $w -= $page; 1425 $w -= $page;
1067 $page &= ~1; 1426 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0; 1427 glTranslate $page * 0.5, 0, 0;
1428 $page ||= 2;
1069 1429
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5; 1430 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1078 my $knob_b = $value + $page * 0.5; 1431 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1079 1432
1080 glBegin GL_QUADS; 1433 glEnable GL_BLEND;
1081 glColor @$fg; 1434 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1082 glVertex $knob_a, 0; 1435 glEnable GL_TEXTURE_2D;
1083 glVertex $knob_a, $h; 1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086 1437
1087 if ($knob_a < $knob_b - 2) { 1438 # draw background
1088 glColor @$bg; 1439 $tex[1]->draw_quad (0, 0, $w, $h);
1089 glVertex $knob_a + 1, 1;
1090 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1;
1093 }
1094 glEnd;
1095 1440
1096 glPopMatrix; 1441 # draw handle
1097} 1442 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1098 1443
1099############################################################################# 1444 glDisable GL_BLEND;
1445 glDisable GL_TEXTURE_2D;
1446}
1100 1447
1448#############################################################################
1449
1450package CFClient::UI::TextView;
1451
1452our @ISA = CFClient::UI::HBox::;
1453
1454use SDL::OpenGL;
1455
1456sub new {
1457 my $class = shift;
1458
1459 my $self = $class->SUPER::new (
1460 par => [],
1461 @_,
1462 children => [
1463 (new CFClient::UI::Empty expand => 1),
1464 (new CFClient::UI::Slider vertical => 1),
1465 ],
1466 );
1467
1468 $self
1469}
1470
1471sub add_paragraph {
1472 my ($self, $color, $text) = @_;
1473
1474 push @{$self->{par}}, [$color, $text];
1475 my $count = scalar @{$self->{par}};
1476 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1477 $self->{children}[1]->update;
1478}
1479
1480sub _draw {
1481 my ($self) = @_;
1482
1483 my $par = $self->{par};
1484
1485 my $bottom = (scalar @$par) - 1;
1486
1487 my $w = $self->{children}[0]{w};
1488 my $y = $self->{h};
1489
1490 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1494
1495 # TODO: everything!
1496 while ($y > 0 && $bottom >= 0) {
1497 my $par = $par->[$bottom--];
1498
1499 my $layout = new CFClient::Layout;
1500
1501 $layout->set_height ($::FONTSIZE);
1502 $layout->set_width ($w);
1503 $layout->set_text ($par->[1]);
1504 my $tex = new_from_layout CFClient::Texture $layout;
1505 $y -= $tex->{h};
1506
1507 glColor @{ $par->[0] };
1508 $tex->draw_quad (0, $y);
1509 }
1510
1511 glDisable GL_TEXTURE_2D;
1512 glDisable GL_BLEND;
1513}
1514
1515#############################################################################
1516
1101package CFClient::Widget::MapWidget; 1517package CFClient::UI::MapWidget;
1102 1518
1103use strict; 1519use strict;
1104 1520
1105use List::Util qw(min max); 1521use List::Util qw(min max);
1106 1522
1107use SDL; 1523use SDL;
1108use SDL::OpenGL; 1524use SDL::OpenGL;
1109use SDL::OpenGL::Constants;
1110 1525
1111our @ISA = CFClient::Widget::; 1526our @ISA = CFClient::UI::Base::;
1112 1527
1113sub new { 1528sub new {
1114 my $class = shift; 1529 my $class = shift;
1115 1530
1116 $class->SUPER::new ( 1531 $class->SUPER::new (
1117 z => -1, 1532 z => -1,
1533 can_focus => 1,
1118 list => (glGenLists 1), 1534 list => (glGenLists 1),
1119 @_ 1535 @_
1120 ) 1536 )
1121} 1537}
1122 1538
1123sub key_down { 1539sub key_down {
… …
1127sub key_up { 1543sub key_up {
1128} 1544}
1129 1545
1130sub size_request { 1546sub size_request {
1131 ( 1547 (
1132 1 + int $::WIDTH / 32, 1548 1 + 32 * int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32, 1549 1 + 32 * int $::HEIGHT / 32,
1134 ) 1550 )
1135} 1551}
1136 1552
1137sub update { 1553sub update {
1138 my ($self) = @_; 1554 my ($self) = @_;
1139 1555
1140 $self->{need_update} = 1; 1556 $self->{need_update} = 1;
1557 $self->SUPER::update;
1141} 1558}
1142 1559
1143sub _draw { 1560sub draw {
1144 my ($self) = @_; 1561 my ($self) = @_;
1145 1562
1563 $self->{need_update}++;#d#
1146 if (delete $self->{need_update}) { 1564 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE; 1565 glNewList $self->{list}, GL_COMPILE;
1148 1566
1149 my $mx = $::CONN->{mapx};
1150 my $my = $::CONN->{mapy};
1151
1152 my $map = $::CONN->{map};
1153
1154 my ($xofs, $yofs);
1155
1156 my $sw = 1 + int $::WIDTH / 32; 1567 my $sw = int $::WIDTH / 32;
1157 my $sh = 1 + int $::HEIGHT / 32; 1568 my $sh = int $::HEIGHT / 32;
1158 1569
1159 if ($::CONN->{mapw} > $sw) { 1570 if ($::MAP) {
1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1571 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1161 } else {
1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1163 }
1164 1572
1165 if ($::CONN->{maph} > $sh) { 1573 if ($::CFG->{fow_enable}) {
1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1574 if ($::CFG->{fow_smooth}) { # smooth fog of war
1167 } else { 1575 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1576 glConvolutionFilter2D
1169 } 1577 GL_CONVOLUTION_2D,
1170 1578 GL_ALPHA,
1171 glEnable GL_TEXTURE_2D; 1579 3, 3,
1172 glEnable GL_BLEND; 1580 GL_ALPHA, GL_FLOAT,
1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 pack "f*",
1174 1582 0.1, 0.1, 0.1,
1175 my $sw4 = ($sw + 3) & ~3; 1583 0.1, 0.2, 0.1,
1176 my $darkness = "\x00" x ($sw4 * $sh); 1584 0.1, 0.1, 0.1,
1177
1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
1180 for my $y (0 .. $sh - 1) {
1181
1182 my $cell = $row->[$y + $yofs]
1183 or next; 1585 ;
1184 1586 glEnable GL_CONVOLUTION_2D;
1185 my $dark = $cell->[0];
1186 if ($dark < 0) {
1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1190 } 1587 }
1191 1588
1192 for my $num (grep $_, @$cell[1,2,3]) { 1589 my $tex = new CFClient::Texture
1193 my $tex = $::CONN->{face}[$num]{texture} || next; 1590 w => $w,
1194 1591 h => $h,
1195 my $w = $tex->{width}; 1592 data => $data,
1196 my $h = $tex->{height}; 1593 internalformat => GL_ALPHA,
1594 format => GL_ALPHA;
1197 1595
1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1596 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1199 } 1597
1598 glEnable GL_BLEND;
1599 glEnable GL_TEXTURE_2D;
1600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1601
1602 glColor +($::CFG->{fow_intensity}) x 3, 1;
1603 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1604
1605 glDisable GL_TEXTURE_2D;
1606 glDisable GL_BLEND;
1200 } 1607 }
1201 } 1608 }
1202 1609
1203# if (1) { # higher quality darkness
1204# $lighting =~ s/(.)/$1$1$1/gs;
1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1206#
1207# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1208#
1209# $lighting = $pb->get_pixels;
1210# $lighting =~ s/(.)../$1/gs;
1211# }
1212
1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
1226 glDisable GL_TEXTURE_2D;
1227 glDisable GL_BLEND;
1228
1229 glEndList; 1610 glEndList;
1230 } 1611 }
1231 1612
1232 glCallList $self->{list}; 1613 glCallList $self->{list};
1614
1615 if ($FOCUS != $self) {
1616 glColor 64/255, 64/255, 64/255;
1617 glLogicOp GL_AND;
1618 glEnable GL_COLOR_LOGIC_OP;
1619 glBegin GL_QUADS;
1620 glVertex 0, 0;
1621 glVertex 0, $::HEIGHT;
1622 glVertex $::WIDTH, $::HEIGHT;
1623 glVertex $::WIDTH, 0;
1624 glEnd;
1625 glDisable GL_COLOR_LOGIC_OP;
1626 }
1233} 1627}
1234 1628
1235my %DIR = ( 1629my %DIR = (
1236 SDLK_KP8, [1, "north"], 1630 SDLK_KP8, [1, "north"],
1237 SDLK_KP9, [2, "northeast"], 1631 SDLK_KP9, [2, "northeast"],
… …
1253 1647
1254 my $mod = $ev->key_mod; 1648 my $mod = $ev->key_mod;
1255 my $sym = $ev->key_sym; 1649 my $sym = $ev->key_sym;
1256 1650
1257 if ($sym == SDLK_KP5) { 1651 if ($sym == SDLK_KP5) {
1258 $::CONN->send ("command stay fire"); 1652 $::CONN->user_send ("command stay fire");
1653 } elsif ($sym == SDLK_a) {
1654 $::CONN->user_send ("command apply");
1259 } elsif (exists $DIR{$sym}) { 1655 } elsif (exists $DIR{$sym}) {
1260 if ($mod & KMOD_SHIFT) { 1656 if ($mod & KMOD_SHIFT) {
1261 $self->{shft}++; 1657 $self->{shft}++;
1262 $::CONN->send ("command fire $DIR{$sym}[0]"); 1658 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1263 } elsif ($mod & KMOD_CTRL) { 1659 } elsif ($mod & KMOD_CTRL) {
1264 $self->{ctrl}++; 1660 $self->{ctrl}++;
1265 $::CONN->send ("command run $DIR{$sym}[0]"); 1661 $::CONN->user_send ("command run $DIR{$sym}[0]");
1266 } else { 1662 } else {
1267 $::CONN->send ("command $DIR{$sym}[1]"); 1663 $::CONN->user_send ("command $DIR{$sym}[1]");
1268 } 1664 }
1269 } 1665 }
1270} 1666}
1271 1667
1272sub key_up { 1668sub key_up {
… …
1274 1670
1275 my $mod = $ev->key_mod; 1671 my $mod = $ev->key_mod;
1276 my $sym = $ev->key_sym; 1672 my $sym = $ev->key_sym;
1277 1673
1278 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1674 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1279 $::CONN->send ("command fire_stop"); 1675 $::CONN->user_send ("command fire_stop");
1280 } 1676 }
1281 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1677 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1282 $::CONN->send ("command run_stop"); 1678 $::CONN->user_send ("command run_stop");
1283 } 1679 }
1284} 1680}
1285 1681
1286############################################################################# 1682#############################################################################
1287 1683
1288package CFClient::Widget::Animator; 1684package CFClient::UI::Animator;
1289 1685
1290use SDL::OpenGL; 1686use SDL::OpenGL;
1291 1687
1292our @ISA = CFClient::Widget::Bin::; 1688our @ISA = CFClient::UI::Bin::;
1293 1689
1294sub moveto { 1690sub moveto {
1295 my ($self, $x, $y) = @_; 1691 my ($self, $x, $y) = @_;
1296 1692
1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1693 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1325 glPopMatrix; 1721 glPopMatrix;
1326} 1722}
1327 1723
1328############################################################################# 1724#############################################################################
1329 1725
1726package CFClient::UI::Flopper;
1727
1728our @ISA = CFClient::UI::Button::;
1729
1730sub new {
1731 my $class = shift;
1732
1733 my $self = $class->SUPER::new (
1734 state => 0,
1735 connect_activate => \&toggle_flopper,
1736 @_
1737 );
1738
1739 if ($self->{state}) {
1740 $self->{state} = 0;
1741 $self->toggle_flopper;
1742 }
1743
1744 $self
1745}
1746
1747sub toggle_flopper {
1748 my ($self) = @_;
1749
1750 # TODO: use animation
1751 if ($self->{state} = !$self->{state}) {
1752 $CFClient::UI::TOPLEVEL->add ($self->{other});
1753 $self->{other}->move (
1754 ($::WIDTH - $self->{other}{w}) * 0.5,
1755 ($::HEIGHT - $self->{other}{h}) * 0.5,
1756 );
1757 } else {
1758 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1759 }
1760}
1761
1762#############################################################################
1763
1330package CFClient::Widget::Toplevel; 1764package CFClient::UI::Toplevel;
1331 1765
1332our @ISA = CFClient::Widget::Container::; 1766our @ISA = CFClient::UI::Container::;
1333 1767
1334sub size_request { 1768sub size_request {
1335 ($::WIDTH, $::HEIGHT) 1769 ($::WIDTH, $::HEIGHT)
1336} 1770}
1337 1771
1338sub size_allocate { 1772sub size_allocate {
1339 my ($self, $w, $h) = @_; 1773 my ($self, $x, $y, $w, $h) = @_;
1340 1774
1341 $self->SUPER::size_allocate ($w, $h); 1775 $self->_size_allocate ($x, $y, $w, $h);
1342 1776
1343 $_->size_allocate ($_->size_request) 1777 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1344 for @{$self->{children}}; 1778 for @{$self->{children}};
1345} 1779}
1346 1780
1347sub translate { 1781sub translate {
1348 my ($self, $x, $y) = @_; 1782 my ($self, $x, $y) = @_;
… …
1351} 1785}
1352 1786
1353sub update { 1787sub update {
1354 my ($self) = @_; 1788 my ($self) = @_;
1355 1789
1356 $self->size_allocate ($self->size_request); 1790 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1357 ::refresh (); 1791 ::refresh ();
1358} 1792}
1359 1793
1360sub add { 1794sub add {
1361 my ($self, $widget) = @_; 1795 my ($self, $widget) = @_;
1362 1796
1363 $self->SUPER::add ($widget); 1797 $self->SUPER::add ($widget);
1364 1798
1365 $widget->size_allocate ($widget->size_request); 1799 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1366} 1800}
1367 1801
1368sub draw { 1802sub draw {
1369 my ($self) = @_; 1803 my ($self) = @_;
1370 1804
1371 $self->_draw; 1805 $self->_draw;
1372} 1806}
1373 1807
1374############################################################################# 1808#############################################################################
1375 1809
1376package CFClient::Widget; 1810package CFClient::UI;
1377 1811
1378$TOPLEVEL = new CFClient::Widget::Toplevel; 1812$TOPLEVEL = new CFClient::UI::Toplevel;
1379 1813
13801 18141
1381 1815

Diff Legend

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