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.48 by root, Sun Apr 9 22:26:09 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
22} 84}
23 85
24sub move { 86sub move {
25 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 88 $self->{x} = $x;
… …
42 104
43 $self->{w} = $w; 105 $self->{w} = $w;
44 $self->{h} = $h; 106 $self->{h} = $h;
45} 107}
46 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
47sub focus_in { 116sub focus_in {
48 my ($widget) = @_; 117 my ($self) = @_;
49 $::FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
50} 122}
51 123
52sub focus_out { 124sub focus_out {
53 my ($widget) = @_; 125 my ($self) = @_;
54}
55 126
56sub key_down { 127 return unless $FOCUS == $self;
57 my ($widget, $sdlev) = @_;
58}
59 128
60sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
61 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
62} 131}
63 132
133sub mouse_motion { }
134sub button_up { }
64sub button_down { 135sub button_down { }
65 my ($widget, $sdlev) = @_; 136sub key_down { }
66} 137sub key_up { }
67 138
68sub button_up {
69 my ($widget, $sdlev) = @_;
70}
71
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 144
78sub draw { 145sub draw {
79 my ($self) = @_; 146 my ($self) = @_;
80 147
81 glPushMatrix; 148 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 150 $self->_draw;
84 if ($self == $::HOVER) { 151 if ($self == $HOVER) {
85 glColor 1, 1, 1, 0.4; 152 glColor 1, 1, 1, 0.4;
86 glEnable GL_BLEND; 153 glEnable GL_BLEND;
87 glBegin GL_QUADS; 154 glBegin GL_QUADS;
88 glVertex 0, 0; 155 glVertex 0 , 0;
89 glVertex $self->{w} - 1, 0; 156 glVertex $self->{w}, 0;
90 glVertex $self->{w} - 1, $self->{h} - 1; 157 glVertex $self->{w}, $self->{h};
91 glVertex 0, $self->{h} - 1; 158 glVertex 0 , $self->{h};
92 glEnd; 159 glEnd;
93 glDisable GL_BLEND; 160 glDisable GL_BLEND;
94 } 161 }
95 glPopMatrix; 162 glPopMatrix;
96} 163}
… …
148 #$self->deactivate; 215 #$self->deactivate;
149} 216}
150 217
151############################################################################# 218#############################################################################
152 219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw {
229}
230
231#############################################################################
232
153package Crossfire::Client::Widget::Container; 233package CFClient::Widget::Container;
154 234
155our @ISA = Crossfire::Client::Widget::; 235our @ISA = CFClient::Widget::;
156 236
157sub new { 237sub new {
158 my ($class, @widgets) = @_; 238 my ($class, %arg) = @_;
159 239
240 my $children = delete $arg{children} || [];
241
160 my $self = $class->SUPER::new (children => []); 242 my $self = $class->SUPER::new (children => [], %arg);
161 $self->add ($_) for @widgets; 243 $self->add ($_) for @$children;
162 244
163 $self 245 $self
164} 246}
165 247
166sub add { 248sub add {
167 my ($self, $chld, $expand) = @_; 249 my ($self, $chld, $expand) = @_;
168 250
169 $chld->{expand} = $expand; 251 $chld->{expand} = $expand;
170 $chld->set_parent ($self); 252 $chld->set_parent ($self);
171 253
172 @{$self->{children}} = 254 $self->{children} = [
173 sort { $a->{z} <=> $b->{z} } 255 sort { $a->{z} <=> $b->{z} }
174 @{$self->{children}}, $chld; 256 @{$self->{children}}, $chld
257 ];
175 258
176 $self->size_allocate ($self->{w}, $self->{h}) 259 $self->size_allocate ($self->{w}, $self->{h})
177 if $self->{w}; #TODO: check for "realised state" 260 if $self->{w}; #TODO: check for "realised state"
178} 261}
179 262
… …
207 $_->draw for @{$self->{children}}; 290 $_->draw for @{$self->{children}};
208} 291}
209 292
210############################################################################# 293#############################################################################
211 294
212package Crossfire::Client::Widget::Bin; 295package CFClient::Widget::Bin;
213 296
214our @ISA = Crossfire::Client::Widget::Container::; 297our @ISA = CFClient::Widget::Container::;
298
299sub new {
300 my ($class, %arg) = @_;
301
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
303
304 $class->SUPER::new (children => [$child], %arg)
305}
306
307sub add {
308 my ($self, $widget) = @_;
309
310 $self->{children} = [];
311
312 $self->SUPER::add ($widget);
313}
314
315sub remove {
316 my ($self, $widget) = @_;
317
318 $self->SUPER::remove ($widget);
319
320 $self->{children} = [new CFClient::Widget::Empty]
321 unless @{$self->{children}};
322}
215 323
216sub child { $_[0]->{children}[0] } 324sub child { $_[0]->{children}[0] }
217 325
218sub size_request { 326sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
227 if $self->{children}[0] 335 if $self->{children}[0]
228} 336}
229 337
230############################################################################# 338#############################################################################
231 339
232package Crossfire::Client::Widget::Toplevel; 340package CFClient::Widget::Window;
233 341
234our @ISA = Crossfire::Client::Widget::Container::; 342our @ISA = CFClient::Widget::Bin::;
343
344use SDL::OpenGL;
345
346sub new {
347 my ($class, %arg) = @_;
348
349 my $self = $class->SUPER::new (%arg);
350}
235 351
236sub update { 352sub update {
237 my ($self) = @_; 353 my ($self) = @_;
238 354
239 ::refresh (); 355 # we want to do this delayed...
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
254our @ISA = Crossfire::Client::Widget::Bin::;
255
256use SDL::OpenGL;
257
258sub new {
259 my ($class, $x, $y, $z, $w, $h) = @_;
260
261 my $self = $class->SUPER::new;
262
263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264}
265
266sub update {
267 my ($self) = @_;
268
269 $self->render_chld; 356 $self->render_chld;
270 $self->SUPER::update; 357 $self->SUPER::update;
271} 358}
272 359
273sub render_chld { 360sub render_chld {
274 my ($self) = @_; 361 my ($self) = @_;
275 362
276 $self->{texture} = 363 $self->{texture} =
277 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
278 $self->{w}, $self->{h}, sub { $self->child->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
279 ); 366 );
280} 367}
281 368
282sub size_allocate { 369sub size_allocate {
… …
299 or return; 386 or return;
300 387
301 glEnable GL_BLEND; 388 glEnable GL_BLEND;
302 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
304 glBindTexture GL_TEXTURE_2D, $tex->{name};
305 391
306 glBegin GL_QUADS; 392 $tex->draw_quad (0, 0, $w, $h);
307 glTexCoord 0, 0; glVertex 0, 0;
308 glTexCoord 0, 1; glVertex 0, $h;
309 glTexCoord 1, 1; glVertex $w, $h;
310 glTexCoord 1, 0; glVertex $w, 0;
311 glEnd;
312 393
313 glDisable GL_BLEND; 394 glDisable GL_BLEND;
314 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
315} 396}
316 397
317############################################################################# 398#############################################################################
318 399
319package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
320 401
321our @ISA = Crossfire::Client::Widget::Bin::; 402our @ISA = CFClient::Widget::Bin::;
322 403
323use SDL::OpenGL; 404use SDL::OpenGL;
324 405
325sub size_request { 406sub size_request {
326 my ($self) = @_; 407 my ($self) = @_;
… …
349 430
350 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
351 432
352 glBegin GL_QUADS; 433 glBegin GL_QUADS;
353 glColor 0, 0, 0; 434 glColor 0, 0, 0;
354 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
355 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
357 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
358 glEnd; 439 glEnd;
359 440
360 $chld->draw; 441 $chld->draw;
361} 442}
362 443
363############################################################################# 444#############################################################################
364 445
365package Crossfire::Client::Widget::FancyFrame; 446package CFClient::Widget::FancyFrame;
366 447
367our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
368 449
369use SDL::OpenGL; 450use SDL::OpenGL;
370 451
371my @tex = 452my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374 455
375sub size_request { 456sub size_request {
376 my ($self) = @_; 457 my ($self) = @_;
377 458
… …
396 $w -= $tex[3]->{width}; 477 $w -= $tex[3]->{width};
397 478
398 $h = $h < 0 ? 0 : $h; 479 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w; 480 $w = $w < 0 ? 0 : $w;
400 481
482 my $child = $self->child;
483
401 $self->child->size_allocate ($w, $h); 484 $child->size_allocate ($w, $h);
402 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 485 $child->move ($tex[3]->{width}, $tex[1]->{height});
403} 486}
404 487
405sub _draw { 488sub _draw {
406 my ($self) = @_; 489 my ($self) = @_;
407 490
… …
412 glEnable GL_TEXTURE_2D; 495 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 498
416 my $top = $tex[1]; 499 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name}; 500 $top->draw_quad (0, 0, $w, $top->{height});
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425 501
426 my $left = $tex[3]; 502 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name}; 503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435 504
436 my $right = $tex[2]; 505 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name}; 506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445 507
446 my $bottom = $tex[4]; 508 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455 510
456 my $bg = $tex[0]; 511 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name}; 512 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461 516
462 my $rep_x = $cw / $bg->{width}; 517 my $rep_x = $cw / $bg->{width};
463 my $rep_y = $ch / $bg->{height}; 518 my $rep_y = $ch / $bg->{height};
464 519
465 glBegin GL_QUADS; 520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471 521
472 glDisable GL_BLEND; 522 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
474 524
475 $self->child->draw; 525 $self->child->draw;
476 526
477} 527}
478 528
479############################################################################# 529#############################################################################
480 530
481package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
482 532
483our @ISA = Crossfire::Client::Widget::Bin::; 533our @ISA = CFClient::Widget::Bin::;
484 534
485use SDL::OpenGL; 535use SDL::OpenGL;
486 536
487sub add { 537sub add {
488 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
… …
563 } 613 }
564} 614}
565 615
566############################################################################# 616#############################################################################
567 617
568package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
569 619
570our @ISA = Crossfire::Client::Widget::Container::; 620our @ISA = CFClient::Widget::Container::;
571 621
572use SDL::OpenGL; 622use SDL::OpenGL;
573 623
574sub size_request { 624sub size_request {
575 my ($self) = @_; 625 my ($self) = @_;
… …
623 } 673 }
624} 674}
625 675
626############################################################################# 676#############################################################################
627 677
628package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
629 679
630our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
631 681
632use SDL::OpenGL; 682use SDL::OpenGL;
633 683
634sub new { 684sub new {
635 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
636 686
637 # TODO: color, and make height, xyz etc. optional 687 # TODO: color, and make height, xyz etc. optional
638 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 688 my $self = $class->SUPER::new (
689 color => [1, 1, 1],
690 height => $::FONTSIZE,
691 text => "",
692 layout => new CFClient::Layout,
693 %arg
694 );
639 695
640 $self->set_text ($text); 696 $self->set_text ($self->{text});
641 697
642 $self 698 $self
643} 699}
644 700
645sub set_text { 701sub set_text {
646 my ($self, $text) = @_; 702 my ($self, $text) = @_;
647 703
648 $self->{text} = $text; 704 $self->{text} = $text;
649 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 705 $self->{layout}->set_markup ($text);
650 706
651 $self->update; 707 delete $self->{texture};
652} 708}
653 709
654sub get_text { 710sub get_text {
655 my ($self, $text) = @_; 711 my ($self, $text) = @_;
656 712
… …
658} 714}
659 715
660sub size_request { 716sub size_request {
661 my ($self) = @_; 717 my ($self) = @_;
662 718
663 ( 719 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
723# (
664 $self->{texture}{width}, 724# $self->{texture}{width},
665 $self->{texture}{height}, 725# $self->{texture}{height},
666 ) 726# )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732}
733
734sub size_allocate {
735 my ($self, $w, $h) = @_;
736
737 $self->SUPER::size_allocate ($w, $h);
738 delete $self->{texture};
667} 739}
668 740
669sub _draw { 741sub _draw {
670 my ($self) = @_; 742 my ($self) = @_;
671 743
672 my $tex = $self->{texture}; 744 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w});
746 new_from_layout CFClient::Texture $self->{layout};
747 };
673 748
674 glEnable GL_BLEND; 749 glEnable GL_BLEND;
675 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
678 glBindTexture GL_TEXTURE_2D, $tex->{name};
679 753
680 glColor 1, 0, 0, 1; # TODO color 754 glColor @{$self->{color}};
681 755
682 glBegin GL_QUADS; 756 $tex->draw_quad (0, 0);
683 glTexCoord 0, 0; glVertex 0 , 0;
684 glTexCoord 0, 1; glVertex 0 , $tex->{height};
685 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
686 glTexCoord 1, 0; glVertex $tex->{width}, 0;
687 glEnd;
688 757
689 glDisable GL_BLEND; 758 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
691} 760}
692 761
693############################################################################# 762#############################################################################
694 763
695package Crossfire::Client::Widget::TextEntry; 764package CFClient::Widget::Entry;
696 765
697our @ISA = Crossfire::Client::Widget::Label::; 766our @ISA = CFClient::Widget::Label::;
698 767
699use SDL; 768use SDL;
700use SDL::OpenGL; 769use SDL::OpenGL;
701 770
702sub key_down { 771sub key_down {
703 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
704 773
705 my $mod = $ev->key_mod; 774 my $mod = $ev->key_mod;
706 my $sym = $ev->key_sym; 775 my $sym = $ev->key_sym;
707 776
708 $ev->set_unicode (1);
709 my $uni = $ev->key_unicode; 777 my $uni = $ev->key_unicode;
710 778
711 my $text = $self->get_text; 779 my $text = $self->get_text;
712 780
713 if ($sym == SDLK_BACKSPACE) { 781 if ($sym == SDLK_BACKSPACE) {
714 substr $text, -1, 1, ''; 782 substr $text, -1, 1, '';
715
716 } elsif ($uni) { 783 } elsif ($uni) {
717 $text .= chr $uni; 784 $text .= chr $uni;
718 } 785 }
786
719 $self->set_text ($text); 787 $self->set_text ($text);
720} 788}
721 789
722############################################################################# 790sub button_down {
791 my ($self, $ev) = @_;
723 792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
724package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
725 823
726use strict; 824use strict;
727 825
728use List::Util qw(min max); 826use List::Util qw(min max);
729 827
730use SDL; 828use SDL;
731use SDL::OpenGL; 829use SDL::OpenGL;
732use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
733 831
734our @ISA = Crossfire::Client::Widget::; 832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
735 843
736sub key_down { 844sub key_down {
737 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
738} 846}
739 847
740sub key_up { 848sub key_up {
741} 849}
742 850
743sub size_request { 851sub size_request {
744 852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
745} 856}
746 857
747sub size_allocate { 858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
748} 862}
749 863
750sub _draw { 864sub _draw {
751 my ($self) = @_; 865 my ($self) = @_;
752 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
753 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
754 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
755 872
756 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
757 874
758 my ($xofs, $yofs); 875 my ($xofs, $yofs);
759 876
760 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
761 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
762 879
763 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
764 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
765 } else { 882 } else {
766 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
767 } 884 }
768 885
769 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
770 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
771 } else { 888 } else {
772 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
773 } 890 }
774 891
775 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
776 glEnable GL_BLEND; 893 glEnable GL_BLEND;
777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
778 895
779 my $sw4 = ($sw + 3) & ~3; 896 my $sw4 = ($sw + 3) & ~3;
780 my $lighting = "\x00" x ($sw4 * $sh); 897 my $darkness = "\x00" x ($sw4 * $sh);
781 898
782 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
783 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
784 902
785 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
786 or next; 904 or next;
787 905
788 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
789 if ($darkness < 0) { 907 if ($dark < 0) {
790 $darkness = 0.15; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
791 } 911 }
792 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
793 912
794 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
795 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
796 915
797 glBindTexture GL_TEXTURE_2D, $tex->{name};
798
799 my $w = $tex->{width}; 916 my $w = $tex->{width};
800 my $h = $tex->{height}; 917 my $h = $tex->{height};
801 918
802 my $px = ($x + 1) * 32 - $w; 919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
803 my $py = ($y + 1) * 32 - $h;
804
805 glBegin GL_QUADS;
806 glTexCoord 0, 0; glVertex $px , $py;
807 glTexCoord 0, 1; glVertex $px , $py + $h;
808 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
809 glTexCoord 1, 0; glVertex $px + $w, $py;
810 glEnd; 920 }
811 } 921 }
812 } 922 }
813 }
814 923
815# if (1) { # higher quality darkness 924# if (1) { # higher quality darkness
816# $lighting =~ s/(.)/$1$1$1/gs; 925# $lighting =~ s/(.)/$1$1$1/gs;
817# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
818# 927#
… …
820# 929#
821# $lighting = $pb->get_pixels; 930# $lighting = $pb->get_pixels;
822# $lighting =~ s/(.)../$1/gs; 931# $lighting =~ s/(.)../$1/gs;
823# } 932# }
824 933
825 $lighting = new Crossfire::Client::Texture
826 width => $sw4,
827 height => $sh,
828 data => $lighting,
829 internalformat => GL_ALPHA4,
830 format => GL_ALPHA;
831
832 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
833 glColor 0, 0, 0, 0.75;
834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
835 glBindTexture GL_TEXTURE_2D, $lighting->{name};
836 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
837 glBegin GL_QUADS;
838 glTexCoord 0, 0; glVertex 0 , 0;
839 glTexCoord 0, 1; glVertex 0 , $sh * 32;
840 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
841 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
842 glEnd;
843 936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
844 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
845 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
846} 954}
847 955
848my %DIR = ( 956my %DIR = (
849 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
850 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
896 } 1004 }
897} 1005}
898 1006
899############################################################################# 1007#############################################################################
900 1008
901package Crossfire::Client::Widget::Animator; 1009package CFClient::Widget::Animator;
902 1010
903use SDL::OpenGL; 1011use SDL::OpenGL;
904 1012
905our @ISA = Crossfire::Client::Widget::Bin::; 1013our @ISA = CFClient::Widget::Bin::;
906 1014
907sub moveto { 1015sub moveto {
908 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
909 1017
910 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
911 $self->{speed} = 0.2; 1019 $self->{speed} = 0.001;
912 $self->{time} = 1; 1020 $self->{time} = 1;
913 1021
914 ::animation_start $self; 1022 ::animation_start $self;
915} 1023}
916 1024
… …
931 1039
932sub _draw { 1040sub _draw {
933 my ($self) = @_; 1041 my ($self) = @_;
934 1042
935 glPushMatrix; 1043 glPushMatrix;
936 glRotate $self->{time} * 10000, 0, 1, 0; 1044 glRotate $self->{time} * 1000, 0, 1, 0;
937 $self->{children}[0]->draw; 1045 $self->{children}[0]->draw;
938 glPopMatrix; 1046 glPopMatrix;
939} 1047}
940 1048
9411; 1049#############################################################################
942 1050
1051package CFClient::Widget::Toplevel;
1052
1053our @ISA = CFClient::Widget::Container::;
1054
1055sub size_request {
1056 ($::WIDTH, $::HEIGHT)
1057}
1058
1059sub size_allocate {
1060 my ($self, $w, $h) = @_;
1061
1062 $self->SUPER::size_allocate ($w, $h);
1063
1064 $_->size_allocate ($_->size_request)
1065 for @{$self->{children}};
1066}
1067
1068sub translate {
1069 my ($self, $x, $y) = @_;
1070
1071 ($x, $y)
1072}
1073
1074sub update {
1075 my ($self) = @_;
1076
1077 $self->size_allocate ($self->size_request);
1078 ::refresh ();
1079}
1080
1081sub add {
1082 my ($self, $widget) = @_;
1083
1084 $self->SUPER::add ($widget);
1085
1086 $widget->size_allocate ($widget->size_request);
1087}
1088
1089sub draw {
1090 my ($self) = @_;
1091
1092 $self->_draw;
1093}
1094
1095#############################################################################
1096
1097package CFClient::Widget;
1098
1099$TOPLEVEL = new CFClient::Widget::Toplevel;
1100
11011
1102

Diff Legend

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