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.47 by root, Sun Apr 9 22:24:43 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, 1; 152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
86 glBegin GL_LINES; 154 glBegin GL_QUADS;
87 glVertex 0, 0; 155 glVertex 0 , 0;
88 glVertex $self->{w} - 1, 0; 156 glVertex $self->{w}, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1; 157 glVertex $self->{w}, $self->{h};
90 glVertex 0, $self->{h} - 1; 158 glVertex 0 , $self->{h};
91 glVertex 0, 0;
92 glEnd; 159 glEnd;
160 glDisable GL_BLEND;
93 } 161 }
94 glPopMatrix; 162 glPopMatrix;
95} 163}
96 164
97sub _draw { 165sub _draw {
… …
147 #$self->deactivate; 215 #$self->deactivate;
148} 216}
149 217
150############################################################################# 218#############################################################################
151 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
152package Crossfire::Client::Widget::Container; 233package CFClient::Widget::Container;
153 234
154our @ISA = Crossfire::Client::Widget::; 235our @ISA = CFClient::Widget::;
155 236
156sub new { 237sub new {
157 my ($class, @widgets) = @_; 238 my ($class, %arg) = @_;
158 239
240 my $children = delete $arg{children} || [];
241
159 my $self = $class->SUPER::new (children => []); 242 my $self = $class->SUPER::new (children => [], %arg);
160 $self->add ($_) for @widgets; 243 $self->add ($_) for @$children;
161 244
162 $self 245 $self
163} 246}
164 247
165sub add { 248sub add {
166 my ($self, $chld, $expand) = @_; 249 my ($self, $chld, $expand) = @_;
167 250
168 $chld->{expand} = $expand; 251 $chld->{expand} = $expand;
169 $chld->set_parent ($self); 252 $chld->set_parent ($self);
170 253
171 @{$self->{children}} = 254 $self->{children} = [
172 sort { $a->{z} <=> $b->{z} } 255 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld; 256 @{$self->{children}}, $chld
257 ];
174 258
175 $self->size_allocate ($self->{w}, $self->{h}) 259 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state" 260 if $self->{w}; #TODO: check for "realised state"
177} 261}
178 262
… …
206 $_->draw for @{$self->{children}}; 290 $_->draw for @{$self->{children}};
207} 291}
208 292
209############################################################################# 293#############################################################################
210 294
211package Crossfire::Client::Widget::Bin; 295package CFClient::Widget::Bin;
212 296
213our @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}
214 323
215sub child { $_[0]->{children}[0] } 324sub child { $_[0]->{children}[0] }
216 325
217sub size_request { 326sub size_request {
218 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
226 if $self->{children}[0] 335 if $self->{children}[0]
227} 336}
228 337
229############################################################################# 338#############################################################################
230 339
231package Crossfire::Client::Widget::Toplevel; 340package CFClient::Widget::Window;
232 341
233our @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}
234 351
235sub update { 352sub update {
236 my ($self) = @_; 353 my ($self) = @_;
237 354
238 ::refresh (); 355 # we want to do this delayed...
239}
240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
249#############################################################################
250
251package Crossfire::Client::Widget::Window;
252
253our @ISA = Crossfire::Client::Widget::Bin::;
254
255use SDL::OpenGL;
256
257sub new {
258 my ($class, $x, $y, $z, $w, $h) = @_;
259
260 my $self = $class->SUPER::new;
261
262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
263}
264
265sub update {
266 my ($self) = @_;
267
268 $self->render_chld; 356 $self->render_chld;
269 $self->SUPER::update; 357 $self->SUPER::update;
270} 358}
271 359
272sub render_chld { 360sub render_chld {
273 my ($self) = @_; 361 my ($self) = @_;
274 362
275 $self->{texture} = 363 $self->{texture} =
276 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
277 $self->{w}, $self->{h}, sub { $self->child->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
278 ); 366 );
279} 367}
280 368
281sub size_allocate { 369sub size_allocate {
… …
298 or return; 386 or return;
299 387
300 glEnable GL_BLEND; 388 glEnable GL_BLEND;
301 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
303 glBindTexture GL_TEXTURE_2D, $tex->{name};
304 391
305 glBegin GL_QUADS; 392 $tex->draw_quad (0, 0, $w, $h);
306 glTexCoord 0, 0; glVertex 0, 0;
307 glTexCoord 0, 1; glVertex 0, $h;
308 glTexCoord 1, 1; glVertex $w, $h;
309 glTexCoord 1, 0; glVertex $w, 0;
310 glEnd;
311 393
312 glDisable GL_BLEND; 394 glDisable GL_BLEND;
313 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
314} 396}
315 397
316############################################################################# 398#############################################################################
317 399
318package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
319 401
320our @ISA = Crossfire::Client::Widget::Bin::; 402our @ISA = CFClient::Widget::Bin::;
321 403
322use SDL::OpenGL; 404use SDL::OpenGL;
323 405
324sub size_request { 406sub size_request {
325 my ($self) = @_; 407 my ($self) = @_;
… …
348 430
349 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
350 432
351 glBegin GL_QUADS; 433 glBegin GL_QUADS;
352 glColor 0, 0, 0; 434 glColor 0, 0, 0;
353 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
354 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
355 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
356 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
357 glEnd; 439 glEnd;
358 440
359 $chld->draw; 441 $chld->draw;
360} 442}
361 443
362############################################################################# 444#############################################################################
363 445
364package Crossfire::Client::Widget::FancyFrame; 446package CFClient::Widget::FancyFrame;
365 447
366our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
367 449
368use SDL::OpenGL; 450use SDL::OpenGL;
369 451
370my @tex = 452my @tex =
371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
372 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);
373 455
374sub size_request { 456sub size_request {
375 my ($self) = @_; 457 my ($self) = @_;
376 458
… …
395 $w -= $tex[3]->{width}; 477 $w -= $tex[3]->{width};
396 478
397 $h = $h < 0 ? 0 : $h; 479 $h = $h < 0 ? 0 : $h;
398 $w = $w < 0 ? 0 : $w; 480 $w = $w < 0 ? 0 : $w;
399 481
482 my $child = $self->child;
483
400 $self->child->size_allocate ($w, $h); 484 $child->size_allocate ($w, $h);
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 485 $child->move ($tex[3]->{width}, $tex[1]->{height});
402} 486}
403 487
404sub _draw { 488sub _draw {
405 my ($self) = @_; 489 my ($self) = @_;
406 490
… …
411 glEnable GL_TEXTURE_2D; 495 glEnable GL_TEXTURE_2D;
412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
414 498
415 my $top = $tex[1]; 499 my $top = $tex[1];
416 glBindTexture GL_TEXTURE_2D, $top->{name}; 500 $top->draw_quad (0, 0, $w, $top->{height});
417
418 glBegin GL_QUADS;
419 glTexCoord 0, 0; glVertex 0 , 0;
420 glTexCoord 0, 1; glVertex 0 , $top->{height};
421 glTexCoord 1, 1; glVertex $w , $top->{height};
422 glTexCoord 1, 0; glVertex $w , 0;
423 glEnd;
424 501
425 my $left = $tex[3]; 502 my $left = $tex[3];
426 glBindTexture GL_TEXTURE_2D, $left->{name}; 503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , $top->{height};
430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
433 glEnd;
434 504
435 my $right = $tex[2]; 505 my $right = $tex[2];
436 glBindTexture GL_TEXTURE_2D, $right->{name}; 506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $w , $top->{height};
443 glEnd;
444 507
445 my $bottom = $tex[4]; 508 my $bottom = $tex[4];
446 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
450 glTexCoord 0, 1; glVertex 0 , $h;
451 glTexCoord 1, 1; glVertex $w , $h;
452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
453 glEnd;
454 510
455 my $bg = $tex[0]; 511 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name}; 512 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 516
461 my $rep_x = $cw / $bg->{width}; 517 my $rep_x = $cw / $bg->{width};
462 my $rep_y = $ch / $bg->{height}; 518 my $rep_y = $ch / $bg->{height};
463 519
464 glBegin GL_QUADS; 520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
469 glEnd;
470 521
471 glDisable GL_BLEND; 522 glDisable GL_BLEND;
472 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
473 524
474 $self->child->draw; 525 $self->child->draw;
475 526
476} 527}
477 528
478############################################################################# 529#############################################################################
479 530
480package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
481 532
482our @ISA = Crossfire::Client::Widget::Bin::; 533our @ISA = CFClient::Widget::Bin::;
483 534
484use SDL::OpenGL; 535use SDL::OpenGL;
485 536
486sub add { 537sub add {
487 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
… …
562 } 613 }
563} 614}
564 615
565############################################################################# 616#############################################################################
566 617
567package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
568 619
569our @ISA = Crossfire::Client::Widget::Container::; 620our @ISA = CFClient::Widget::Container::;
570 621
571use SDL::OpenGL; 622use SDL::OpenGL;
572 623
573sub size_request { 624sub size_request {
574 my ($self) = @_; 625 my ($self) = @_;
… …
622 } 673 }
623} 674}
624 675
625############################################################################# 676#############################################################################
626 677
627package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
628 679
629our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
630 681
631use SDL::OpenGL; 682use SDL::OpenGL;
632 683
633sub new { 684sub new {
634 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
635 686
636 # TODO: color, and make height, xyz etc. optional 687 # TODO: color, and make height, xyz etc. optional
637 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 );
638 695
639 $self->set_text ($text); 696 $self->set_text ($self->{text});
640 697
641 $self 698 $self
642} 699}
643 700
644sub set_text { 701sub set_text {
645 my ($self, $text) = @_; 702 my ($self, $text) = @_;
646 703
647 $self->{text} = $text; 704 $self->{text} = $text;
648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 705 $self->{layout}->set_markup ($text);
649 706
650 $self->update; 707 delete $self->{texture};
651} 708}
652 709
653sub get_text { 710sub get_text {
654 my ($self, $text) = @_; 711 my ($self, $text) = @_;
655 712
… …
657} 714}
658 715
659sub size_request { 716sub size_request {
660 my ($self) = @_; 717 my ($self) = @_;
661 718
662 ( 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# (
663 $self->{texture}{width}, 724# $self->{texture}{width},
664 $self->{texture}{height}, 725# $self->{texture}{height},
665 ) 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};
666} 739}
667 740
668sub _draw { 741sub _draw {
669 my ($self) = @_; 742 my ($self) = @_;
670 743
671 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 };
672 748
673 glEnable GL_BLEND; 749 glEnable GL_BLEND;
674 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
677 glBindTexture GL_TEXTURE_2D, $tex->{name};
678 753
679 glColor 1, 0, 0, 1; # TODO color 754 glColor @{$self->{color}};
680 755
681 glBegin GL_QUADS; 756 $tex->draw_quad (0, 0);
682 glTexCoord 0, 0; glVertex 0 , 0;
683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
685 glTexCoord 1, 0; glVertex $tex->{width}, 0;
686 glEnd;
687 757
688 glDisable GL_BLEND; 758 glDisable GL_BLEND;
689 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
690} 760}
691 761
692############################################################################# 762#############################################################################
693 763
694package Crossfire::Client::Widget::TextEntry; 764package CFClient::Widget::Entry;
695 765
696our @ISA = Crossfire::Client::Widget::Label::; 766our @ISA = CFClient::Widget::Label::;
697 767
698use SDL; 768use SDL;
699use SDL::OpenGL; 769use SDL::OpenGL;
700 770
701sub key_down { 771sub key_down {
702 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
703 773
704 my $mod = $ev->key_mod; 774 my $mod = $ev->key_mod;
705 my $sym = $ev->key_sym; 775 my $sym = $ev->key_sym;
706 776
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode; 777 my $uni = $ev->key_unicode;
709 778
710 my $text = $self->get_text; 779 my $text = $self->get_text;
711 780
712 if ($sym == SDLK_BACKSPACE) { 781 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, ''; 782 substr $text, -1, 1, '';
714
715 } elsif ($uni) { 783 } elsif ($uni) {
716 $text .= chr $uni; 784 $text .= chr $uni;
717 } 785 }
786
718 $self->set_text ($text); 787 $self->set_text ($text);
719} 788}
720 789
721############################################################################# 790sub button_down {
791 my ($self, $ev) = @_;
722 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
723package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
724 823
725use strict; 824use strict;
726 825
727use List::Util qw(min max); 826use List::Util qw(min max);
728 827
729use SDL; 828use SDL;
730use SDL::OpenGL; 829use SDL::OpenGL;
731use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
732 831
733our @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}
734 843
735sub key_down { 844sub key_down {
736 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
737} 846}
738 847
739sub key_up { 848sub key_up {
740} 849}
741 850
742sub size_request { 851sub size_request {
743 852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
744} 856}
745 857
746sub size_allocate { 858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
747} 862}
748 863
749sub _draw { 864sub _draw {
750 my ($self) = @_; 865 my ($self) = @_;
751 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
752 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
753 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
754 872
755 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
756 874
757 my ($xofs, $yofs); 875 my ($xofs, $yofs);
758 876
759 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
760 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
761 879
762 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
763 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
764 } else { 882 } else {
765 $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};
766 } 884 }
767 885
768 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
769 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
770 } else { 888 } else {
771 $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};
772 } 890 }
773 891
774 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
775 glEnable GL_BLEND; 893 glEnable GL_BLEND;
776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
777 895
778 my $sw4 = ($sw + 3) & ~3; 896 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh); 897 my $darkness = "\x00" x ($sw4 * $sh);
780 898
781 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
782 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
783 902
784 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
785 or next; 904 or next;
786 905
787 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
788 if ($darkness < 0) { 907 if ($dark < 0) {
789 $darkness = 0.15; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
790 } 911 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
792 912
793 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
794 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
795 915
796 glBindTexture GL_TEXTURE_2D, $tex->{name};
797
798 my $w = $tex->{width}; 916 my $w = $tex->{width};
799 my $h = $tex->{height}; 917 my $h = $tex->{height};
800 918
801 my $px = ($x + 1) * 32 - $w; 919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
802 my $py = ($y + 1) * 32 - $h;
803
804 glBegin GL_QUADS;
805 glTexCoord 0, 0; glVertex $px , $py;
806 glTexCoord 0, 1; glVertex $px , $py + $h;
807 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
808 glTexCoord 1, 0; glVertex $px + $w, $py;
809 glEnd; 920 }
810 } 921 }
811 } 922 }
812 }
813 923
814# if (1) { # higher quality darkness 924# if (1) { # higher quality darkness
815# $lighting =~ s/(.)/$1$1$1/gs; 925# $lighting =~ s/(.)/$1$1$1/gs;
816# 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;
817# 927#
… …
819# 929#
820# $lighting = $pb->get_pixels; 930# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs; 931# $lighting =~ s/(.)../$1/gs;
822# } 932# }
823 933
824 $lighting = new Crossfire::Client::Texture
825 width => $sw4,
826 height => $sh,
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
832 glColor 0, 0, 0, 0.75;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
842 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
843 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
844 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
845} 954}
846 955
847my %DIR = ( 956my %DIR = (
848 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
849 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
895 } 1004 }
896} 1005}
897 1006
898############################################################################# 1007#############################################################################
899 1008
900package Crossfire::Client::Widget::Animator; 1009package CFClient::Widget::Animator;
901 1010
902use SDL::OpenGL; 1011use SDL::OpenGL;
903 1012
904our @ISA = Crossfire::Client::Widget::Bin::; 1013our @ISA = CFClient::Widget::Bin::;
905 1014
906sub moveto { 1015sub moveto {
907 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
908 1017
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2; 1019 $self->{speed} = 0.001;
911 $self->{time} = 1; 1020 $self->{time} = 1;
912 1021
913 ::animation_start $self; 1022 ::animation_start $self;
914} 1023}
915 1024
… …
930 1039
931sub _draw { 1040sub _draw {
932 my ($self) = @_; 1041 my ($self) = @_;
933 1042
934 glPushMatrix; 1043 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0; 1044 glRotate $self->{time} * 1000, 0, 1, 0;
936 $self->{children}[0]->draw; 1045 $self->{children}[0]->draw;
937 glPopMatrix; 1046 glPopMatrix;
938} 1047}
939 1048
9401; 1049#############################################################################
941 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