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.64 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:14:13 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 { @_ }, $class 84 bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class
79} 92}
80 93
81sub move { 94sub move {
82 my ($self, $x, $y, $z) = @_; 95 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 96 $self->{x} = $x;
… …
92sub size_request { 105sub size_request {
93 require Carp; 106 require Carp;
94 Carp::confess "size_request is abtract"; 107 Carp::confess "size_request is abtract";
95} 108}
96 109
97sub size_allocate { 110sub _size_allocate {
98 my ($self, $w, $h) = @_; 111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
99 117
100 $self->{w} = $w; 118 $self->{w} = $w;
101 $self->{h} = $h; 119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
102} 128}
103 129
104# translate global koordinates to local coordinate system 130# translate global koordinates to local coordinate system
105sub translate { 131sub translate {
106 my ($self, $x, $y) = @_; 132 my ($self, $x, $y) = @_;
… …
109} 135}
110 136
111sub focus_in { 137sub focus_in {
112 my ($self) = @_; 138 my ($self) = @_;
113 139
140 return if $FOCUS == $self;
141
114 my $focus = $FOCUS; $FOCUS = $self; 142 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 143 $focus->update if $focus;
116 $FOCUS->update; 144 $FOCUS->update;
117} 145}
118 146
… …
125 $focus->update if $focus; #? 153 $focus->update if $focus; #?
126} 154}
127 155
128sub mouse_motion { } 156sub mouse_motion { }
129sub button_up { } 157sub button_up { }
130sub button_down { }
131sub key_down { } 158sub key_down { }
132sub key_up { } 159sub key_up { }
160
161sub button_down {
162 my ($self, $ev, $x, $y) = @_;
163
164 $self->focus_in;
165}
133 166
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 167sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 168sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 169sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 170sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 171sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 172
140sub draw { 173sub draw {
141 my ($self) = @_; 174 my ($self) = @_;
142 175
176 return unless $self->{h} && $self->{w};
177
143 glPushMatrix; 178 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 179 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 180 $self->_draw;
181 glPopMatrix;
182
146 if ($self == $HOVER) { 183 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4; 184 my ($x, $y) = @$self{qw(x y)};
185
186 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 187 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 189 glBegin GL_QUADS;
150 glVertex 0 , 0; 190 glVertex $x , $y;
151 glVertex $self->{w}, 0; 191 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 192 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 193 glVertex $x , $y + $self->{h};
154 glEnd; 194 glEnd;
155 glDisable GL_BLEND; 195 glDisable GL_BLEND;
156 } 196 }
157 glPopMatrix;
158} 197}
159 198
160sub _draw { 199sub _draw {
161 my ($self) = @_; 200 my ($self) = @_;
162 201
… …
202 241
203 $self->{parent}->update 242 $self->{parent}->update
204 if $self->{parent}; 243 if $self->{parent};
205} 244}
206 245
246sub connect {
247 my ($self, $signal, $cb) = @_;
248
249 push @{ $self->{cb}{$signal} }, $cb;
250}
251
252sub emit {
253 my ($self, $signal, @args) = @_;
254
255 $_->($self, @args)
256 for @{$self->{cb}{$signal} || []};
257}
258
207sub DESTROY { 259sub DESTROY {
208 my ($self) = @_; 260 my ($self) = @_;
209 261
210 #$self->deactivate; 262 #$self->deactivate;
211} 263}
212 264
213############################################################################# 265#############################################################################
214 266
267package CFClient::UI::DrawBG;
268
269our @ISA = CFClient::UI::Base::;
270
271use strict;
272use SDL::OpenGL;
273
274sub new {
275 my $class = shift;
276
277 # range [value, low, high, page]
278
279 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1],
282 @_
283 )
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 my ($w, $h) = @$self{qw(w h)};
290
291 glEnable GL_BLEND;
292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
293 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
294
295 glBegin GL_QUADS;
296 glVertex 0 , 0;
297 glVertex 0 , $h;
298 glVertex $w, $h;
299 glVertex $w, 0;
300 glEnd;
301
302 glDisable GL_BLEND;
303}
304
305#############################################################################
306
307package CFClient::UI::Empty;
308
309our @ISA = CFClient::UI::Base::;
310
311sub size_request {
312 (0, 0)
313}
314
315sub draw { }
316
317#############################################################################
318
215package CFClient::Widget::Container; 319package CFClient::UI::Container;
216 320
217our @ISA = CFClient::Widget::; 321our @ISA = CFClient::UI::Base::;
218 322
219sub new { 323sub new {
220 my ($class, %arg) = @_; 324 my ($class, %arg) = @_;
221 325
222 my $children = delete $arg{children} || []; 326 my $children = delete $arg{children} || [];
223 327
224 my $self = $class->SUPER::new (children => []); 328 my $self = $class->SUPER::new (children => [], %arg);
225 $self->add ($_) for @$children; 329 $self->add ($_) for @$children;
226 330
227 $self 331 $self
228} 332}
229 333
230sub add { 334sub add {
231 my ($self, $chld, $expand) = @_; 335 my ($self, $chld) = @_;
232 336
233 $chld->{expand} = $expand;
234 $chld->set_parent ($self); 337 $chld->set_parent ($self);
235 338
236 @{$self->{children}} = 339 $self->{children} = [
237 sort { $a->{z} <=> $b->{z} } 340 sort { $a->{z} <=> $b->{z} }
238 @{$self->{children}}, $chld; 341 @{$self->{children}}, $chld
342 ];
239 343
240 $self->size_allocate ($self->{w}, $self->{h}) 344 $self->{w} = $self->{h} = -1;
241 if $self->{w}; #TODO: check for "realised state" 345 $self->update;
242} 346}
243 347
244sub remove { 348sub remove {
245 my ($self, $widget) = @_; 349 my ($self, $widget) = @_;
246 350
247 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 351 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
248 352
249 $self->size_allocate ($self->{w}, $self->{h}); 353 $self->size_allocate (0, 0, $self->{w}, $self->{h});
250} 354}
251 355
252sub find_widget { 356sub find_widget {
253 my ($self, $x, $y) = @_; 357 my ($self, $x, $y) = @_;
254 358
… …
271 $_->draw for @{$self->{children}}; 375 $_->draw for @{$self->{children}};
272} 376}
273 377
274############################################################################# 378#############################################################################
275 379
276package CFClient::Widget::Bin; 380package CFClient::UI::Bin;
277 381
278our @ISA = CFClient::Widget::Container::; 382our @ISA = CFClient::UI::Container::;
383
384sub new {
385 my ($class, %arg) = @_;
386
387 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
388
389 $class->SUPER::new (children => [$child], %arg)
390}
391
392sub add {
393 my ($self, $widget) = @_;
394
395 $self->{children} = [];
396
397 $self->SUPER::add ($widget);
398}
399
400sub remove {
401 my ($self, $widget) = @_;
402
403 $self->SUPER::remove ($widget);
404
405 $self->{children} = [new CFClient::UI::Empty]
406 unless @{$self->{children}};
407}
279 408
280sub child { $_[0]->{children}[0] } 409sub child { $_[0]->{children}[0] }
281 410
282sub size_request { 411sub size_request {
283 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 412 $_[0]{children}[0]->size_request
284} 413}
285 414
286sub size_allocate { 415sub size_allocate {
287 my ($self, $w, $h) = @_; 416 my ($self, $x, $y, $w, $h) = @_;
288 417
289 $self->SUPER::size_allocate ($w, $h); 418 $self->_size_allocate ($x, $y, $w, $h) or return;
419
290 $self->{children}[0]->size_allocate ($w, $h) 420 $self->{children}[0]->size_allocate (0, 0, $w, $h);
291 if $self->{children}[0]
292} 421}
293 422
294############################################################################# 423#############################################################################
295 424
296package CFClient::Widget::Window; 425package CFClient::UI::Window;
297 426
298our @ISA = CFClient::Widget::Bin::; 427our @ISA = CFClient::UI::Bin::;
299 428
300use SDL::OpenGL; 429use SDL::OpenGL;
301 430
302sub new { 431sub new {
303 my ($class, %arg) = @_; 432 my ($class, %arg) = @_;
… …
321 $self->{w}, $self->{h}, sub { $self->child->draw } 450 $self->{w}, $self->{h}, sub { $self->child->draw }
322 ); 451 );
323} 452}
324 453
325sub size_allocate { 454sub size_allocate {
326 my ($self, $w, $h) = @_; 455 my ($self, $x, $y, $w, $h) = @_;
327 456
328 $self->{w} = $w; 457 $self->_size_allocate ($x, $y, $w, $h) or return;
329 $self->{h} = $h;
330 458
331 $self->child->size_allocate ($w, $h); 459 $self->child->size_allocate (0, 0, $w, $h);
332 460
333 $self->render_chld; 461 $self->render_chld;
334} 462}
335 463
336sub _draw { 464sub _draw {
… …
340 468
341 my $tex = $self->{texture} 469 my $tex = $self->{texture}
342 or return; 470 or return;
343 471
344 glEnable GL_BLEND; 472 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
345 glEnable GL_TEXTURE_2D; 474 glEnable GL_TEXTURE_2D;
346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
347 476
348 $tex->draw_quad (0, 0, $w, $h); 477 $tex->draw_quad (0, 0, $w, $h);
349 478
… …
351 glDisable GL_TEXTURE_2D; 480 glDisable GL_TEXTURE_2D;
352} 481}
353 482
354############################################################################# 483#############################################################################
355 484
356package CFClient::Widget::Frame; 485package CFClient::UI::Frame;
357 486
358our @ISA = CFClient::Widget::Bin::; 487our @ISA = CFClient::UI::Bin::;
359 488
360use SDL::OpenGL; 489use SDL::OpenGL;
361 490
362sub size_request { 491sub size_request {
363 my ($self) = @_; 492 my ($self) = @_;
… …
368 497
369 map { $_ + 4 } $chld->size_request; 498 map { $_ + 4 } $chld->size_request;
370} 499}
371 500
372sub size_allocate { 501sub size_allocate {
373 my ($self, $w, $h) = @_; 502 my ($self, $x, $y, $w, $h) = @_;
374 503
375 $self->{w} = $w; 504 $self->_size_allocate ($x, $y, $w, $h) or return;
376 $self->{h} = $h;
377 505
378 $self->child->size_allocate ($w - 4, $h - 4); 506 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
379 $self->child->move (2, 2);
380} 507}
381 508
382sub _draw { 509sub _draw {
383 my ($self) = @_; 510 my ($self) = @_;
384 511
… …
397 $chld->draw; 524 $chld->draw;
398} 525}
399 526
400############################################################################# 527#############################################################################
401 528
402package CFClient::Widget::FancyFrame; 529package CFClient::UI::FancyFrame;
403 530
404our @ISA = CFClient::Widget::Bin::; 531our @ISA = CFClient::UI::Bin::;
405 532
406use SDL::OpenGL; 533use SDL::OpenGL;
407 534
408my @tex = 535my @tex =
409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 537 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
411 538
412sub size_request { 539sub size_request {
413 my ($self) = @_; 540 my ($self) = @_;
414 541
542 my ($w, $h) =
543 $self->{user_w} && $self->{user_h}
544 ? ($self->{user_w}, $self->{user_h})
415 my ($w, $h) = $self->SUPER::size_request; 545 : ($self->SUPER::size_request);
416 546
417 $h += $tex[1]->{height}; 547 $h += $tex[1]->{h};
418 $h += $tex[4]->{height}; 548 $h += $tex[4]->{h};
419 $w += $tex[2]->{width}; 549 $w += $tex[2]->{w};
420 $w += $tex[3]->{width}; 550 $w += $tex[3]->{w};
421 551
422 ($w, $h) 552 ($w, $h)
423} 553}
424 554
425sub size_allocate { 555sub size_allocate {
426 my ($self, $w, $h) = @_; 556 my ($self, $x, $y, $w, $h) = @_;
427 557
428 $self->SUPER::size_allocate ($w, $h); 558 $self->_size_allocate ($x, $y, $w, $h) or return;
429 559
430 $h -= $tex[1]->{height}; 560 $h -= $tex[1]{h};
431 $h -= $tex[4]->{height}; 561 $h -= $tex[4]{h};
432 $w -= $tex[2]->{width}; 562 $w -= $tex[2]{w};
433 $w -= $tex[3]->{width}; 563 $w -= $tex[3]{w};
434 564
435 $h = $h < 0 ? 0 : $h; 565 $h = $h < 0 ? 0 : $h;
436 $w = $w < 0 ? 0 : $w; 566 $w = $w < 0 ? 0 : $w;
437 567
438 $self->child->size_allocate ($w, $h); 568 my $child = $self->child;
439 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 569
570 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571}
572
573sub button_down {
574 my ($self, $ev, $x, $y) = @_;
575
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
578
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h});
581
582 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_;
584
585 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586
587 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy;
589 $self->update;
590 };
591
592 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $tex[1]{h}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y});
597
598 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_;
600
601 ($x, $y) = ($ev->motion_x, $ev->motion_y);
602
603 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 };
606 }
607}
608
609sub button_up {
610 my ($self, $ev, $x, $y) = @_;
611
612 delete $self->{motion};
613}
614
615sub mouse_motion {
616 my ($self, $ev, $x, $y) = @_;
617
618 $self->{motion}->($ev, $x, $y) if $self->{motion};
440} 619}
441 620
442sub _draw { 621sub _draw {
443 my ($self) = @_; 622 my ($self) = @_;
444 623
445 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h) = ($self->{w}, $self->{h});
446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
447 626
448 glEnable GL_BLEND; 627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
449 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452 631
453 my $top = $tex[1]; 632 my $top = $tex[1];
454 $top->draw_quad (0, 0, $w, $top->{height}); 633 $top->draw_quad (0, 0, $w, $top->{h});
455 634
456 my $left = $tex[3]; 635 my $left = $tex[3];
457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
458 637
459 my $right = $tex[2]; 638 my $right = $tex[2];
460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 639 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
461 640
462 my $bottom = $tex[4]; 641 my $bottom = $tex[4];
463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 642 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
464 643
465 my $bg = $tex[0]; 644 my $bg = $tex[0];
645
466 glBindTexture GL_TEXTURE_2D, $bg->{name}; 646 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 648 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 649 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470 650
471 my $rep_x = $cw / $bg->{width}; 651 my $rep_x = $cw / $bg->{w};
472 my $rep_y = $ch / $bg->{height}; 652 my $rep_y = $ch / $bg->{h};
473 653
474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
475 655
656 glDisable GL_TEXTURE_2D;
476 glDisable GL_BLEND; 657 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D;
478 658
479 $self->child->draw; 659 $self->child->draw;
480 660
481} 661}
482 662
483############################################################################# 663#############################################################################
484 664
485package CFClient::Widget::Table; 665package CFClient::UI::Table;
486 666
487our @ISA = CFClient::Widget::Bin::; 667our @ISA = CFClient::UI::Base::;
668
669use List::Util qw(max sum);
488 670
489use SDL::OpenGL; 671use SDL::OpenGL;
490 672
491sub add { 673sub add {
492 my ($self, $x, $y, $chld) = @_; 674 my ($self, $x, $y, $chld) = @_;
493 my $old_chld = $self->{children}[$y][$x];
494 675
495 $self->{children}[$y][$x] = $chld; 676 $self->{children}[$y][$x] = $chld;
496 $chld->set_parent ($self); 677 $chld->set_parent ($self);
678
679 $self->{w} = $self->{h} = -1;
497 $self->update; 680 $self->update;
498} 681}
499 682
500sub max_row_height { 683sub get_wh {
501 my ($self, $row) = @_; 684 my ($self) = @_;
502 685
503 my $hs = 0; 686 my (@w, @h);
504 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 687
688 for my $y (0 .. $#{$self->{children}}) {
505 my $c = $self->{children}->[$row]->[$xi]; 689 my $row = $self->{children}[$y]
506 if ($c) { 690 or next;
691
692 for my $x (0 .. $#$row) {
693 my $widget = $row->[$x]
694 or next;
507 my ($w, $h) = $c->size_request; 695 my ($w, $h) = $widget->size_request;
508 if ($hs < $h) { $hs = $h } 696
697 $w[$x] = max $w[$x], $w;
698 $h[$y] = max $h[$y], $h;
509 } 699 }
510 } 700 }
511 return $hs;
512}
513 701
514sub max_col_width { 702 (\@w, \@h)
703}
704
705sub size_request {
515 my ($self, $col) = @_; 706 my ($self) = @_;
516 707
708 my ($ws, $hs) = $self->get_wh;
709
710 (
711 (List::Util::sum @$ws),
712 (List::Util::sum @$hs),
713 )
714}
715
716sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_;
718
719 $self->_size_allocate ($x, $y, $w, $h) or return;
720
721 my ($ws, $hs) = $self->get_wh;
722
723 my $req_w = List::Util::sum @$ws;
724 my $req_h = List::Util::sum @$hs;
725
726 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws;
728 $_ *= $h / $req_h for @$hs;
729
730 my $y;
731
732 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r]
734 or next;
735
517 my $ws = 0; 736 my $x = 0;
518 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 737 my $row_h = $hs->[$r];
519 my $c = ($self->{children}->[$yi] || [])->[$col]; 738
520 if ($c) { 739 for my $c (0 .. $#$row) {
521 my ($w, $h) = $c->size_request; 740 my $widget = $row->[$c]
522 if ($ws < $w) { $ws = $w } 741 or next;
742
743 my $col_w = $ws->[$c];
744
745 $widget->size_allocate ($x, $y, $col_w, $row_h);
746
747 $x += $col_w;
523 } 748 }
749
750 $y += $row_h;
524 } 751 }
525 return $ws; 752
526} 753}
754
755sub find_widget {
756 my ($self, $x, $y) = @_;
757
758 $x -= $self->{x};
759 $y -= $self->{y};
760
761 my $res;
762
763 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
764 $res = $_->find_widget ($x, $y)
765 and return $res;
766 }
767
768 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
769}
770
771sub _draw {
772 my ($self) = @_;
773
774 for (grep $_, @{$self->{children}}) {
775 $_->draw for grep $_, @$_;
776 }
777}
778
779#############################################################################
780
781package CFClient::UI::HBox;
782
783# TODO: wrap into common Box base class
784
785our @ISA = CFClient::UI::Container::;
527 786
528sub size_request { 787sub size_request {
529 my ($self) = @_; 788 my ($self) = @_;
530 789
790 my @alloc = map [$_->size_request], @{$self->{children}};
791
792 (
793 (List::Util::sum map $_->[0], @alloc),
794 (List::Util::max map $_->[1], @alloc),
795 )
796}
797
798sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804
531 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
532 806
533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
534 $hs += $self->max_row_height ($yi);
535 }
536 808
537 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
538 my $wm = 0; 810
539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
540 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
541 } 826 }
542 if ($ws < $wm) { $ws = $wm }
543 } 827 }
544
545 return ($ws, $hs);
546}
547
548sub _draw {
549 my ($self) = @_;
550 828
551 my $y = 0; 829 my $y = 0;
552 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
553 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
554 834
555 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
556
557 my $c = $self->{children}->[$yi]->[$xi];
558 if ($c) {
559 $c->move ($x, $y, 0); #TODO: Move to size_request
560 $c->draw if $c;
561 }
562
563 $x += $self->max_col_width ($xi);
564 }
565
566 $y += $self->max_row_height ($yi);
567 } 836 }
568} 837}
569 838
570############################################################################# 839#############################################################################
571 840
572package CFClient::Widget::VBox; 841package CFClient::UI::VBox;
573 842
843# TODO: wrap into common Box base class
844
574our @ISA = CFClient::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
575
576use SDL::OpenGL;
577 846
578sub size_request { 847sub size_request {
579 my ($self) = @_; 848 my ($self) = @_;
580 849
581 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
585 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
586 ) 855 )
587} 856}
588 857
589sub size_allocate { 858sub size_allocate {
590 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
591 860
592 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h) or return;
593 $self->h ($h);
594 862
595 my $exp; 863 return unless $self->{h};
596 my @oth; 864
597 # find expand widget 865 my $children = $self->{children};
598 for (@{$self->{children}}) { 866
599 if ($_->{expand}) { 867 my @h = map +($_->size_request)[1], @$children;
868
869 my $req_h = List::Util::sum @h;
870
871 if ($req_h > $h) {
872 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h;
874 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children;
600 $exp = $_; 876 $exp ||= 1;
601 last; 877
878 for (0 .. $#$children) {
879 my $child = $children->[$_];
880
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
602 } 882 }
603 push @oth, $_;
604 }
605
606 my ($ow, $oh);
607
608 # get sizes of other widgets
609 for (@oth) {
610 my ($w, $h) = $_->size_request;
611 $oh += $h;
612 if ($ow < $w) { $ow = $w }
613 } 883 }
614 884
615 my $y = 0; 885 my $y = 0;
616 for (@{$self->{children}}) { 886 for (0 .. $#$children) {
617 $_->move (0, $y); 887 my $child = $children->[$_];
618 888 my $h = $h[$_];
619 if ($_ == $exp) {
620 $_->size_allocate ($w, $h - $oh);
621 $y += $h - $oh;
622 } else {
623 my ($cw, $h) = $_->size_request;
624 $_->size_allocate ($w, $h); 889 $child->size_allocate (0, $y, $w, $h);
890
625 $y += $h; 891 $y += $h;
626 }
627 } 892 }
628} 893}
629 894
630############################################################################# 895#############################################################################
631 896
632package CFClient::Widget::Label; 897package CFClient::UI::Label;
633 898
634our @ISA = CFClient::Widget::; 899our @ISA = CFClient::UI::Base::;
635 900
636use SDL::OpenGL; 901use SDL::OpenGL;
637 902
638sub new { 903sub new {
639 my ($class, %arg) = @_; 904 my ($class, %arg) = @_;
640 905
641 # TODO: color, and make height, xyz etc. optional
642 my $self = $class->SUPER::new ( 906 my $self = $class->SUPER::new (
643 color => [1, 1, 1], 907 fg => [1, 1, 1],
644 height => $::FONTSIZE, 908 height => $::FONTSIZE,
645 text => "", 909 text => "",
910 align => -1,
911 padding => 2,
646 layout => new CFClient::Layout, 912 layout => new CFClient::Layout,
647 %arg 913 %arg
648 ); 914 );
649 915
650 $self->set_text ($self->{text}); 916 $self->set_text ($self->{text});
651 917
652 $self 918 $self
653} 919}
654 920
921sub escape_text {
922 local $_ = $_[1];
923
924 s/&/&amp;/g;
925 s/>/&gt;/g;
926 s/</&lt;/g;
927
928 $_[1]
929}
930
655sub set_text { 931sub set_text {
656 my ($self, $text) = @_; 932 my ($self, $text) = @_;
657 933
658 $self->{text} = $text; 934 $self->{text} = $text;
659 $self->{layout}->set_markup ($text); 935 $self->{layout}->set_markup ($text);
660 936
661 delete $self->{texture}; 937 delete $self->{texture};
938 $self->update;
662} 939}
663 940
664sub get_text { 941sub get_text {
665 my ($self, $text) = @_; 942 my ($self, $text) = @_;
666 943
… …
670sub size_request { 947sub size_request {
671 my ($self) = @_; 948 my ($self) = @_;
672 949
673 $self->{layout}->set_width; 950 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height}); 951 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size 952 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 953
677# ( 954 (
678# $self->{texture}{width}, 955 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 956 $h + $self->{padding} * 2,
680# ) 957 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 958}
687 959
688sub size_allocate { 960sub size_allocate {
689 my ($self, $w, $h) = @_; 961 my ($self, $x, $y, $w, $h) = @_;
690 962
691 $self->SUPER::size_allocate ($w, $h); 963 $self->_size_allocate ($x, $y, $w, $h) or return;
964
692 delete $self->{texture}; 965 delete $self->{texture};
966}
967
968sub update {
969 my ($self) = @_;
970
971 delete $self->{texture};
972 $self->SUPER::update;
693} 973}
694 974
695sub _draw { 975sub _draw {
696 my ($self) = @_; 976 my ($self) = @_;
697 977
698 my $tex = $self->{texture} ||= do { 978 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 979 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout}; 980 new_from_layout CFClient::Texture $self->{layout}
701 }; 981 };
702 982
703 glEnable GL_BLEND; 983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
707 987
708 glColor @{$self->{color}}; 988 glColor @{$self->{fg}};
709 989
710 $tex->draw_quad (0, 0); 990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
711 994
995 $tex->draw_quad ($x, $self->{padding});
996
997 glDisable GL_TEXTURE_2D;
712 glDisable GL_BLEND; 998 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D;
714} 999}
715 1000
716############################################################################# 1001#############################################################################
717 1002
718package CFClient::Widget::Entry; 1003package CFClient::UI::Entry;
719 1004
720our @ISA = CFClient::Widget::Label::; 1005our @ISA = CFClient::UI::Label::;
721 1006
722use SDL; 1007use SDL;
723use SDL::OpenGL; 1008use SDL::OpenGL;
724 1009
1010sub new {
1011 my $class = shift;
1012
1013 $class->SUPER::new (
1014 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1],
1017 active_fg => [0, 0, 0],
1018 @_
1019 )
1020}
1021
1022sub _set_text {
1023 my ($self, $text) = @_;
1024
1025 $self->{last_activity} = $::NOW;
1026
1027 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w});
1029
1030 $text =~ s/./*/g if $self->{hidden};
1031
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1033
1034 $text = substr $text, 0, $self->{cursor};
1035 utf8::encode $text;
1036
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1038}
1039
1040sub size_request {
1041 my ($self) = @_;
1042
1043 my ($w, $h) = $self->SUPER::size_request;
1044
1045 ($w + 1, $h) # add 1 for cursor
1046}
1047
1048sub size_allocate {
1049 my ($self, $x, $y, $w, $h) = @_;
1050
1051 $self->SUPER::size_allocate ($x, $y, $w, $h);
1052
1053 $self->_set_text ($self->{text});
1054}
1055
1056sub set_text {
1057 my ($self, $text) = @_;
1058
1059 $self->{cursor} = length $text;
1060 $self->_set_text ($text);
1061 $self->update;
1062}
1063
725sub key_down { 1064sub key_down {
726 my ($self, $ev) = @_; 1065 my ($self, $ev) = @_;
727 1066
728 my $mod = $ev->key_mod; 1067 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym; 1068 my $sym = $ev->key_sym;
… …
731 my $uni = $ev->key_unicode; 1070 my $uni = $ev->key_unicode;
732 1071
733 my $text = $self->get_text; 1072 my $text = $self->get_text;
734 1073
735 if ($sym == SDLK_BACKSPACE) { 1074 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, ''; 1075 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1076 } elsif ($sym == SDLK_DELETE) {
1077 substr $text, $self->{cursor}, 1, "";
1078 } elsif ($sym == SDLK_LEFT) {
1079 --$self->{cursor} if $self->{cursor};
1080 } elsif ($sym == SDLK_RIGHT) {
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text;
737 } elsif ($uni) { 1086 } elsif ($uni) {
738 $text .= chr $uni; 1087 substr $text, $self->{cursor}++, 0, chr $uni;
739 } 1088 }
740 1089
741 $self->set_text ($text); 1090 $self->_set_text ($text);
1091 $self->update;
1092}
1093
1094sub focus_in {
1095 my ($self) = @_;
1096
1097 $self->{last_activity} = $::NOW;
1098
1099 $self->SUPER::focus_in;
742} 1100}
743 1101
744sub button_down { 1102sub button_down {
745 my ($self, $ev) = @_; 1103 my ($self, $ev, $x, $y) = @_;
746 1104
747 $self->focus_in; 1105 $self->SUPER::button_down ($ev, $x, $y);
1106
1107 my $idx = $self->{layout}->xy_to_index ($x, $y);
1108
1109 # byte-index to char-index
1110 my $text = $self->{text};
1111 utf8::encode $text;
1112 $self->{cursor} = length substr $text, 0, $idx;
1113
1114 $self->_set_text ($self->{text});
1115 $self->update;
748} 1116}
749 1117
750sub mouse_motion { 1118sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_; 1119 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1120# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753} 1121}
754 1122
755sub _draw { 1123sub _draw {
756 my ($self) = @_; 1124 my ($self) = @_;
757 1125
1126 local $self->{fg} = $self->{fg};
1127
758 if ($FOCUS == $self) { 1128 if ($FOCUS == $self) {
759 glColor 1, 1, 1; 1129 glColor @{$self->{active_bg}};
1130 $self->{fg} = $self->{active_fg};
760 } else { 1131 } else {
761 glColor 0.7, 0.7, 0.7; 1132 glColor @{$self->{bg}};
762 } 1133 }
763 1134
1135 glEnable GL_BLEND;
1136 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
764 glBegin GL_QUADS; 1137 glBegin GL_QUADS;
765 glVertex 0 , 0; 1138 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1; 1139 glVertex 0 , $self->{h};
767 glVertex $self->{w} - 1, $self->{h} - 1; 1140 glVertex $self->{w}, $self->{h};
768 glVertex $self->{w} - 1, 0; 1141 glVertex $self->{w}, 0;
769 glEnd; 1142 glEnd;
1143 glDisable GL_BLEND;
770 1144
771 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
772}
773 1146
774############################################################################# 1147 #TODO: force update every cursor change :(
1148 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1149 glColor @{$self->{fg}};
1150 glBegin GL_LINES;
1151 glVertex $self->{cur_x}, $self->{cur_y};
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1153 glEnd;
1154 }
1155}
775 1156
1157#############################################################################
1158
1159package CFClient::UI::Slider;
1160
1161use strict;
1162
1163use SDL::OpenGL;
1164
1165our @ISA = CFClient::UI::DrawBG::;
1166
1167sub new {
1168 my $class = shift;
1169
1170 # range [value, low, high, page]
1171
1172 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10],
1176 req_w => 40,
1177 req_h => 10,
1178 vertical => 0,
1179 @_
1180 );
1181
1182 $self
1183}
1184
1185sub size_request {
1186 my ($self) = @_;
1187
1188 my $w = $self->{req_w};
1189 my $h = $self->{req_h};
1190
1191 $self->{vertical} ? ($h, $w) : ($w, $h)
1192}
1193
1194sub button_down {
1195 my ($self, $ev, $x, $y) = @_;
1196
1197 $self->SUPER::button_down ($ev, $x, $y);
1198 $self->mouse_motion ($ev, $x, $y);
1199}
1200
1201sub mouse_motion {
1202 my ($self, $ev, $x, $y) = @_;
1203
1204 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208
1209 $x = $x * ($hi - $lo) / $w + $lo;
1210 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x;
1213
1214 $self->emit (changed => $x);
1215 $self->update;
1216 }
1217}
1218
1219sub _draw {
1220 my ($self) = @_;
1221
1222 $self->SUPER::_draw ();
1223
1224 my ($w, $h) = @$self{qw(w h)};
1225
1226 if ($self->{vertical}) {
1227 # draw a vertical slider like a rotated horizontal slider
1228
1229 glRotate 90, 0, 0, 1;
1230 glTranslate 0, -$self->{w}, 0;
1231
1232 ($w, $h) = ($h, $w);
1233 }
1234
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237
1238 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239
1240 $page = int $page * $w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo);
1242
1243 $w -= $page;
1244 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0;
1246
1247 glColor @$fg;
1248 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h;
1251 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252 glEnd;
1253
1254 my $knob_a = $value - $page * 0.5;
1255 my $knob_b = $value + $page * 0.5;
1256
1257 glBegin GL_QUADS;
1258 glColor @$fg;
1259 glVertex $knob_a, 0;
1260 glVertex $knob_a, $h;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263
1264 if ($knob_a < $knob_b - 2) {
1265 glColor @$bg;
1266 glVertex $knob_a + 1, 1;
1267 glVertex $knob_a + 1, $h - 1;
1268 glVertex $knob_b - 1, $h - 1;
1269 glVertex $knob_b - 1, 1;
1270 }
1271 glEnd;
1272}
1273
1274#############################################################################
1275
776package CFClient::Widget::MapWidget; 1276package CFClient::UI::MapWidget;
777 1277
778use strict; 1278use strict;
779 1279
780use List::Util qw(min max); 1280use List::Util qw(min max);
781 1281
782use SDL; 1282use SDL;
783use SDL::OpenGL; 1283use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785 1284
786our @ISA = CFClient::Widget::; 1285our @ISA = CFClient::UI::Base::;
787 1286
788sub new { 1287sub new {
789 my $class = shift; 1288 my $class = shift;
790 1289
791 $class->SUPER::new (z => -1, @_) 1290 $class->SUPER::new (
1291 z => -1,
1292 list => (glGenLists 1),
1293 @_
1294 )
792} 1295}
793 1296
794sub key_down { 1297sub key_down {
795 print "MAPKEYDOWN\n"; 1298 print "MAPKEYDOWN\n";
796} 1299}
… …
798sub key_up { 1301sub key_up {
799} 1302}
800 1303
801sub size_request { 1304sub size_request {
802 ( 1305 (
803 1 + int $::WIDTH / 32, 1306 1 + 32 * int $::WIDTH / 32,
804 1 + int $::HEIGHT / 32, 1307 1 + 32 * int $::HEIGHT / 32,
805 ) 1308 )
806} 1309}
807 1310
1311sub update {
1312 my ($self) = @_;
1313
1314 $self->{need_update} = 1;
1315 $self->SUPER::update;
1316}
1317
808sub _draw { 1318sub draw {
809 my ($self) = @_; 1319 my ($self) = @_;
810 1320
1321 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE;
1323
811 my $mx = $::CONN->{mapx}; 1324 my $mx = $::CONN->{mapx};
812 my $my = $::CONN->{mapy}; 1325 my $my = $::CONN->{mapy};
813 1326
814 my $map = $::CONN->{map}; 1327 my $map = $::CONN->{map};
815 1328
816 my ($xofs, $yofs); 1329 my ($xofs, $yofs);
817 1330
818 my $sw = 1 + int $::WIDTH / 32; 1331 my $sw = 1 + int $::WIDTH / 32;
819 my $sh = 1 + int $::HEIGHT / 32; 1332 my $sh = 1 + int $::HEIGHT / 32;
820 1333
821 if ($::CONN->{mapw} > $sw) { 1334 if ($::CONN->{mapw} > $sw) {
822 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
823 } else { 1336 } else {
824 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
825 } 1338 }
826 1339
827 if ($::CONN->{maph} > $sh) { 1340 if ($::CONN->{maph} > $sh) {
828 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
829 } else { 1342 } else {
830 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1343 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
831 } 1344 }
832 1345
833 glEnable GL_TEXTURE_2D; 1346 glEnable GL_TEXTURE_2D;
834 glEnable GL_BLEND; 1347 glEnable GL_BLEND;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 1350
837 my $sw4 = ($sw + 3) & ~3; 1351 my $sw4 = ($sw + 3) & ~3;
838 my $darkness = "\x00" x ($sw4 * $sh); 1352 my $darkness = "\x00" x ($sw4 * $sh);
839 1353
840 for my $x (0 .. $sw - 1) { 1354 for my $x (0 .. $sw - 1) {
841 my $row = $map->[$x + $xofs]; 1355 my $row = $map->[$x + $xofs];
842 for my $y (0 .. $sh - 1) { 1356 for my $y (0 .. $sh - 1) {
843 1357
844 my $cell = $row->[$y + $yofs] 1358 my $cell = $row->[$y + $yofs]
845 or next; 1359 or next;
846 1360
847 my $dark = $cell->[0]; 1361 my $dark = $cell->[0];
848 if ($dark < 0) { 1362 if ($dark < 0) {
849 substr $darkness, $y * $sw4 + $x, 1, chr 224; 1363 substr $darkness, $y * $sw4 + $x, 1, chr 224;
850 } else { 1364 } else {
851 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 1365 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
852 } 1366 }
853 1367
854 for my $num (grep $_, @$cell[1,2,3]) { 1368 for my $num (grep $_, @$cell[1,2,3]) {
855 my $tex = $::CONN->{face}[$num]{texture} || next; 1369 my $tex = $::CONN->{face}[$num]{texture} || next;
856 1370
857 my $w = $tex->{width}; 1371 my ($w, $h) = @$tex{qw(w h)};
858 my $h = $tex->{height};
859 1372
860 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1374 }
861 } 1375 }
862 } 1376 }
863 }
864 1377
865# if (1) { # higher quality darkness 1378# if (1) { # higher quality darkness
866# $lighting =~ s/(.)/$1$1$1/gs; 1379# $lighting =~ s/(.)/$1$1$1/gs;
867# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1380# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
868# 1381#
… …
870# 1383#
871# $lighting = $pb->get_pixels; 1384# $lighting = $pb->get_pixels;
872# $lighting =~ s/(.)../$1/gs; 1385# $lighting =~ s/(.)../$1/gs;
873# } 1386# }
874 1387
875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
877 1389
878 $darkness = new CFClient::Texture 1390 $darkness = new CFClient::Texture
879 width => $sw4, 1391 w => $sw4,
880 height => $sh, 1392 h => $sh,
881 data => $darkness, 1393 data => $darkness,
882 internalformat => GL_ALPHA, 1394 internalformat => GL_ALPHA,
883 format => GL_ALPHA; 1395 format => GL_ALPHA;
884 1396
885 glColor 0.45, 0.45, 0.45, 1; 1397 glColor 0.45, 0.45, 0.45, 1;
886 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1398 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
887 1399
888 glDisable GL_TEXTURE_2D; 1400 glDisable GL_TEXTURE_2D;
889 glDisable GL_BLEND; 1401 glDisable GL_BLEND;
1402
1403 glEndList;
1404 }
1405
1406 glCallList $self->{list};
890} 1407}
891 1408
892my %DIR = ( 1409my %DIR = (
893 SDLK_KP8, [1, "north"], 1410 SDLK_KP8, [1, "north"],
894 SDLK_KP9, [2, "northeast"], 1411 SDLK_KP9, [2, "northeast"],
… …
940 } 1457 }
941} 1458}
942 1459
943############################################################################# 1460#############################################################################
944 1461
945package CFClient::Widget::Animator; 1462package CFClient::UI::Animator;
946 1463
947use SDL::OpenGL; 1464use SDL::OpenGL;
948 1465
949our @ISA = CFClient::Widget::Bin::; 1466our @ISA = CFClient::UI::Bin::;
950 1467
951sub moveto { 1468sub moveto {
952 my ($self, $x, $y) = @_; 1469 my ($self, $x, $y) = @_;
953 1470
954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1471 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
982 glPopMatrix; 1499 glPopMatrix;
983} 1500}
984 1501
985############################################################################# 1502#############################################################################
986 1503
987package CFClient::Widget::Toplevel; 1504package CFClient::UI::Toplevel;
988 1505
989our @ISA = CFClient::Widget::Container::; 1506our @ISA = CFClient::UI::Container::;
990 1507
991sub size_request { 1508sub size_request {
992 ($::WIDTH, $::HEIGHT) 1509 ($::WIDTH, $::HEIGHT)
993} 1510}
994 1511
995sub size_allocate { 1512sub size_allocate {
996 my ($self, $w, $h) = @_; 1513 my ($self, $x, $y, $w, $h) = @_;
997 1514
998 $self->SUPER::size_allocate ($w, $h); 1515 $self->_size_allocate ($x, $y, $w, $h);
999 1516
1000 $_->size_allocate ($_->size_request) 1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1001 for @{$self->{children}}; 1518 for @{$self->{children}};
1002} 1519}
1003 1520
1004sub translate { 1521sub translate {
1005 my ($self, $x, $y) = @_; 1522 my ($self, $x, $y) = @_;
… …
1008} 1525}
1009 1526
1010sub update { 1527sub update {
1011 my ($self) = @_; 1528 my ($self) = @_;
1012 1529
1013 $self->size_allocate ($self->size_request); 1530 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1014 ::refresh (); 1531 ::refresh ();
1015} 1532}
1016 1533
1017sub add { 1534sub add {
1018 my ($self, $widget) = @_; 1535 my ($self, $widget) = @_;
1019 1536
1020 $self->SUPER::add ($widget); 1537 $self->SUPER::add ($widget);
1021 1538
1022 $widget->size_allocate ($widget->size_request); 1539 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1023} 1540}
1024 1541
1025sub draw { 1542sub draw {
1026 my ($self) = @_; 1543 my ($self) = @_;
1027 1544
1028 $self->_draw; 1545 $self->_draw;
1029} 1546}
1030 1547
1031############################################################################# 1548#############################################################################
1032 1549
1033package CFClient::Widget; 1550package CFClient::UI;
1034 1551
1035$TOPLEVEL = new CFClient::Widget::Toplevel; 1552$TOPLEVEL = new CFClient::UI::Toplevel;
1036 1553
10371 15541
1038 1555

Diff Legend

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