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.17 by elmex, Sat Apr 8 13:34:19 2006 UTC vs.
Revision 1.45 by root, Sun Apr 9 22:19:03 2006 UTC

1package Crossfire::Client::Widget; 1package Crossfire::Client::Widget;
2 2
3use strict; 3use strict;
4
5use Scalar::Util;
6
4use SDL::OpenGL; 7use SDL::OpenGL;
5use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
6 9
10use Crossfire::Client;
11
7our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
8our @ACTIVE_WIDGETS;
9 13
10# class methods for events 14# class methods for events
11sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
12sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
13sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
14sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
15 19
16sub new { 20sub new {
17 my $class = shift; 21 my $class = shift;
18 22
19 bless { @_ }, $class 23 bless { @_ }, $class
20} 24}
21 25
22sub activate { 26sub move {
23 push @ACTIVE_WIDGETS, $_[0]; 27 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x;
29 $self->{y} = $y;
30 $self->{z} = $z if defined $z;
24} 31}
25 32
26sub deactivate { 33sub needs_redraw {
27 @ACTIVE_WIDGETS = 34 0
28 sort { $a->{z} <=> $b->{z} }
29 grep { $_ != $_[0] }
30 @ACTIVE_WIDGETS;
31} 35}
32 36
33sub size_request { 37sub size_request {
38 require Carp;
34 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
35} 47}
36 48
37sub focus_in { 49sub focus_in {
38 my ($widget) = @_; 50 my ($widget) = @_;
39 $FOCUS = $widget; 51 $FOCUS = $widget;
57 69
58sub button_up { 70sub button_up {
59 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
60} 72}
61 73
62sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
63sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
64sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
65sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
66sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
67 79
68sub draw { 80sub draw {
73 $self->_draw; 85 $self->_draw;
74 glPopMatrix; 86 glPopMatrix;
75} 87}
76 88
77sub _draw { 89sub _draw {
78 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
79} 93}
80 94
81sub bbox { 95sub bbox {
82 my ($widget) = @_; 96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
83} 104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
134}
135
136sub DESTROY {
137 my ($self) = @_;
138
139 #$self->deactivate;
140}
141
142#############################################################################
84 143
85package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
86 145
87our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
88 147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state"
169}
170
171sub remove {
172 my ($self, $widget) = @_;
173
174 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
175
176 $self->size_allocate ($self->{w}, $self->{h});
177}
178
179sub find_widget {
180 my ($self, $x, $y) = @_;
181
182 $x -= $self->{x};
183 $y -= $self->{y};
184
185 my $res;
186
187 for (@{ $self->{children} }) {
188 $res = $_->find_widget ($x, $y)
189 and return $res;
190 }
191
192 ()
193}
194
195sub _draw {
196 my ($self) = @_;
197
198 $_->draw for @{$self->{children}};
199}
200
201#############################################################################
202
203package Crossfire::Client::Widget::Bin;
204
205our @ISA = Crossfire::Client::Widget::Container::;
206
207sub child { $_[0]->{children}[0] }
208
209sub size_request {
210 $_[0]{children}[0]->size_request if $_[0]{children}[0];
211}
212
213sub size_allocate {
214 my ($self, $w, $h) = @_;
215
216 $self->SUPER::size_allocate ($w, $h);
217 $self->{children}[0]->size_allocate ($w, $h)
218 if $self->{children}[0]
219}
220
221#############################################################################
222
223package Crossfire::Client::Widget::Toplevel;
224
225our @ISA = Crossfire::Client::Widget::Container::;
226
227sub update {
228 my ($self) = @_;
229
230 ::refresh ();
231}
232
233sub add {
234 my ($self, $widget) = @_;
235
236 $self->SUPER::add ($widget);
237
238 $widget->size_allocate ($widget->size_request);
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
89use SDL::OpenGL; 247use SDL::OpenGL;
90 248
91sub add { $_[0]->{child} = $_[1] } 249sub new {
92sub get { $_[0]->{child} } 250 my ($class, $x, $y, $z, $w, $h) = @_;
93 251
94sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 252 my $self = $class->SUPER::new;
95 253
96sub _draw { die "Containers can't be drawn!" } 254 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
255}
256
257sub update {
258 my ($self) = @_;
259
260 $self->render_chld;
261 $self->SUPER::update;
262}
263
264sub render_chld {
265 my ($self) = @_;
266
267 $self->{texture} =
268 Crossfire::Client::Texture->new_from_opengl (
269 $self->{w}, $self->{h}, sub { $self->child->draw }
270 );
271}
272
273sub size_allocate {
274 my ($self, $w, $h) = @_;
275
276 $self->{w} = $w;
277 $self->{h} = $h;
278
279 $self->child->size_allocate ($w, $h);
280
281 $self->render_chld;
282}
283
284sub _draw {
285 my ($self) = @_;
286
287 my ($w, $h) = ($self->w, $self->h);
288
289 my $tex = $self->{texture}
290 or return;
291
292 glEnable GL_BLEND;
293 glEnable GL_TEXTURE_2D;
294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
295 glBindTexture GL_TEXTURE_2D, $tex->{name};
296
297 glBegin GL_QUADS;
298 glTexCoord 0, 0; glVertex 0, 0;
299 glTexCoord 0, 1; glVertex 0, $h;
300 glTexCoord 1, 1; glVertex $w, $h;
301 glTexCoord 1, 0; glVertex $w, 0;
302 glEnd;
303
304 glDisable GL_BLEND;
305 glDisable GL_TEXTURE_2D;
306}
307
308#############################################################################
97 309
98package Crossfire::Client::Widget::Frame; 310package Crossfire::Client::Widget::Frame;
99 311
100our @ISA = Crossfire::Client::Widget::Container::; 312our @ISA = Crossfire::Client::Widget::Bin::;
101 313
102use SDL::OpenGL; 314use SDL::OpenGL;
103 315
104sub size_request { 316sub size_request {
105 my ($self) = @_; 317 my ($self) = @_;
106 my $chld = $self->get 318 my $chld = $self->child
107 or return (0, 0); 319 or return (0, 0);
320
321 $chld->move (2, 2);
322
108 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
109} 324}
110 325
326sub size_allocate {
327 my ($self, $w, $h) = @_;
328
329 $self->{w} = $w;
330 $self->{h} = $h;
331
332 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->child->move (2, 2);
334}
335
111sub _draw { 336sub _draw {
112 my ($self) = @_; 337 my ($self) = @_;
113 338
114 my $chld = $self->get; 339 my $chld = $self->child;
115 340
116 my ($w, $h) = $chld->size_request; 341 my ($w, $h) = $chld->size_request;
117 342
118 glColor 1, 0, 0;
119 glBegin GL_QUADS; 343 glBegin GL_QUADS;
344 glColor 0, 0, 0;
120 glTexCoord 0, 0; glVertex 0 , 0; 345 glTexCoord 0, 0; glVertex 0 , 0;
121 glTexCoord 0, 1; glVertex 0 , $h + 4; 346 glTexCoord 0, 1; glVertex 0 , $h + 4;
122 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
123 glTexCoord 1, 0; glVertex $w + 4 , 0; 348 glTexCoord 1, 0; glVertex $w + 4 , 0;
124 glEnd; 349 glEnd;
125 350
126 glPushMatrix;
127 glTranslate (2, 2, 0);
128 $chld->_draw; 351 $chld->draw;
129 glPopMatrix;
130} 352}
353
354#############################################################################
355
356package Crossfire::Client::Widget::FancyFrame;
357
358our @ISA = Crossfire::Client::Widget::Bin::;
359
360use SDL::OpenGL;
361
362my @tex =
363 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
364 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
365
366sub size_request {
367 my ($self) = @_;
368
369 my ($w, $h) = $self->SUPER::size_request;
370
371 $h += $tex[1]->{height};
372 $h += $tex[4]->{height};
373 $w += $tex[2]->{width};
374 $w += $tex[3]->{width};
375
376 ($w, $h)
377}
378
379sub size_allocate {
380 my ($self, $w, $h) = @_;
381
382 $self->SUPER::size_allocate ($w, $h);
383
384 $h -= $tex[1]->{height};
385 $h -= $tex[4]->{height};
386 $w -= $tex[2]->{width};
387 $w -= $tex[3]->{width};
388
389 $h = $h < 0 ? 0 : $h;
390 $w = $w < 0 ? 0 : $w;
391
392 $self->child->size_allocate ($w, $h);
393 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
394}
395
396sub _draw {
397 my ($self) = @_;
398
399 my ($w, $h) = ($self->{w}, $self->{h});
400 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
401
402 glEnable GL_BLEND;
403 glEnable GL_TEXTURE_2D;
404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406
407 my $top = $tex[1];
408 glBindTexture GL_TEXTURE_2D, $top->{name};
409
410 glBegin GL_QUADS;
411 glTexCoord 0, 0; glVertex 0 , 0;
412 glTexCoord 0, 1; glVertex 0 , $top->{height};
413 glTexCoord 1, 1; glVertex $w , $top->{height};
414 glTexCoord 1, 0; glVertex $w , 0;
415 glEnd;
416
417 my $left = $tex[3];
418 glBindTexture GL_TEXTURE_2D, $left->{name};
419
420 glBegin GL_QUADS;
421 glTexCoord 0, 0; glVertex 0 , $top->{height};
422 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425 glEnd;
426
427 my $right = $tex[2];
428 glBindTexture GL_TEXTURE_2D, $right->{name};
429
430 glBegin GL_QUADS;
431 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434 glTexCoord 1, 0; glVertex $w , $top->{height};
435 glEnd;
436
437 my $bottom = $tex[4];
438 glBindTexture GL_TEXTURE_2D, $bottom->{name};
439
440 glBegin GL_QUADS;
441 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442 glTexCoord 0, 1; glVertex 0 , $h;
443 glTexCoord 1, 1; glVertex $w , $h;
444 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445 glEnd;
446
447 my $bg = $tex[0];
448 glBindTexture GL_TEXTURE_2D, $bg->{name};
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452
453 my $rep_x = $cw / $bg->{width};
454 my $rep_y = $ch / $bg->{height};
455
456 glBegin GL_QUADS;
457 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461 glEnd;
462
463 glDisable GL_BLEND;
464 glDisable GL_TEXTURE_2D;
465
466 $self->child->draw;
467
468}
469
470#############################################################################
131 471
132package Crossfire::Client::Widget::Table; 472package Crossfire::Client::Widget::Table;
133 473
134our @ISA = Crossfire::Client::Widget::Container::; 474our @ISA = Crossfire::Client::Widget::Bin::;
135 475
136use SDL::OpenGL; 476use SDL::OpenGL;
137 477
138sub add { 478sub add {
139 my ($self, $x, $y, $chld) = @_; 479 my ($self, $x, $y, $chld) = @_;
480 my $old_chld = $self->{children}[$y][$x];
481
140 $self->{childs}[$y][$x] = $chld; 482 $self->{children}[$y][$x] = $chld;
483 $chld->set_parent ($self);
484 $self->update;
141} 485}
142 486
143sub max_row_height { 487sub max_row_height {
144 my ($self, $row) = @_; 488 my ($self, $row) = @_;
145 489
146 my $hs = 0; 490 my $hs = 0;
147 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 491 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
148 my $c = $self->{childs}->[$row]->[$xi]; 492 my $c = $self->{children}->[$row]->[$xi];
149 if ($c) { 493 if ($c) {
150 my ($w, $h) = $c->size_request; 494 my ($w, $h) = $c->size_request;
151 if ($hs < $h) { $hs = $h } 495 if ($hs < $h) { $hs = $h }
152 } 496 }
153 } 497 }
156 500
157sub max_col_width { 501sub max_col_width {
158 my ($self, $col) = @_; 502 my ($self, $col) = @_;
159 503
160 my $ws = 0; 504 my $ws = 0;
161 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 505 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
162 my $c = ($self->{childs}->[$yi] || [])->[$col]; 506 my $c = ($self->{children}->[$yi] || [])->[$col];
163 if ($c) { 507 if ($c) {
164 my ($w, $h) = $c->size_request; 508 my ($w, $h) = $c->size_request;
165 if ($ws < $w) { $ws = $w } 509 if ($ws < $w) { $ws = $w }
166 } 510 }
167 } 511 }
171sub size_request { 515sub size_request {
172 my ($self) = @_; 516 my ($self) = @_;
173 517
174 my ($hs, $ws) = (0, 0); 518 my ($hs, $ws) = (0, 0);
175 519
176 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 520 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
177 $hs += $self->max_row_height ($yi); 521 $hs += $self->max_row_height ($yi);
178 } 522 }
179 523
180 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 524 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
181 my $wm = 0; 525 my $wm = 0;
182 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 526 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
183 $wm += $self->max_col_width ($xi) 527 $wm += $self->max_col_width ($xi)
184 } 528 }
185 if ($ws < $wm) { $ws = $wm } 529 if ($ws < $wm) { $ws = $wm }
186 } 530 }
187 531
190 534
191sub _draw { 535sub _draw {
192 my ($self) = @_; 536 my ($self) = @_;
193 537
194 my $y = 0; 538 my $y = 0;
195 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 539 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
196 my $x = 0; 540 my $x = 0;
197 541
198 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 542 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
199 543
200 glPushMatrix;
201 glTranslate ($x, $y, 0);
202 my $c = $self->{childs}->[$yi]->[$xi]; 544 my $c = $self->{children}->[$yi]->[$xi];
545 if ($c) {
546 $c->move ($x, $y, 0); #TODO: Move to size_request
203 $c->_draw if $c; 547 $c->draw if $c;
204 glPopMatrix; 548 }
205 549
206 $x += $self->max_col_width ($xi); 550 $x += $self->max_col_width ($xi);
207 } 551 }
208 552
209 $y += $self->max_row_height ($yi); 553 $y += $self->max_row_height ($yi);
210 } 554 }
211} 555}
212 556
557#############################################################################
558
213package Crossfire::Client::Widget::VBox; 559package Crossfire::Client::Widget::VBox;
214 560
215our @ISA = Crossfire::Client::Widget::Container::; 561our @ISA = Crossfire::Client::Widget::Container::;
216 562
217use SDL::OpenGL; 563use SDL::OpenGL;
218 564
219sub add {
220 my ($self, $chld) = @_;
221 push @{$self->{childs}}, $chld;
222}
223
224sub size_request { 565sub size_request {
225 my ($self) = @_; 566 my ($self) = @_;
226 567
227 my ($hs, $ws) = (0, 0); 568 my @alloc = map [$_->size_request], @{$self->{children}};
569
570 (
571 (List::Util::max map $_->[0], @alloc),
572 (List::Util::sum map $_->[1], @alloc),
573 )
574}
575
576sub size_allocate {
577 my ($self, $w, $h) = @_;
578
579 $self->w ($w);
580 $self->h ($h);
581
582 my $exp;
583 my @oth;
584 # find expand widget
228 for (@{$self->{childs} || []}) { 585 for (@{$self->{children}}) {
586 if ($_->{expand}) {
587 $exp = $_;
588 last;
589 }
590 push @oth, $_;
591 }
592
593 my ($ow, $oh);
594
595 # get sizes of other widgets
596 for (@oth) {
229 my ($w, $h) = $_->size_request; 597 my ($w, $h) = $_->size_request;
230 $hs += $h; 598 $oh += $h;
231 if ($ws < $w) { $ws = $w } 599 if ($ow < $w) { $ow = $w }
232 } 600 }
233 601
234 return ($ws, $hs); 602 my $y = 0;
235}
236
237sub _draw {
238 my ($self) = @_;
239
240 my ($x, $y);
241 for (@{$self->{childs} || []}) { 603 for (@{$self->{children}}) {
242 glPushMatrix; 604 $_->move (0, $y);
243 glTranslate (0, $y, 0); 605
244 $_->_draw; 606 if ($_ == $exp) {
245 glPopMatrix; 607 $_->size_allocate ($w, $h - $oh);
608 $y += $h - $oh;
609 } else {
246 my ($w, $h) = $_->size_request; 610 my ($cw, $h) = $_->size_request;
611 $_->size_allocate ($w, $h);
247 $y += $h; 612 $y += $h;
613 }
248 } 614 }
249} 615}
616
617#############################################################################
250 618
251package Crossfire::Client::Widget::Label; 619package Crossfire::Client::Widget::Label;
252 620
253our @ISA = Crossfire::Client::Widget::; 621our @ISA = Crossfire::Client::Widget::;
254 622
255use SDL::OpenGL; 623use SDL::OpenGL;
256 624
257sub new { 625sub new {
258 my ($class, $x, $y, $z, $ttf, $text) = @_; 626 my ($class, $x, $y, $z, $height, $text) = @_;
259 627
628 # TODO: color, and make height, xyz etc. optional
260 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 629 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
261 630
262 $self->set_text ($text); 631 $self->set_text ($text);
263 632
264 $self 633 $self
265} 634}
266 635
267sub set_text { 636sub set_text {
268 my ($self, $text) = @_; 637 my ($self, $text) = @_;
638
639 $self->{text} = $text;
269 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 640 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
641
642 $self->update;
270} 643}
271 644
272sub get_text { 645sub get_text {
273 my ($self, $text) = @_; 646 my ($self, $text) = @_;
647
274 $self->{text} 648 $self->{text}
275} 649}
276 650
277sub size_request { 651sub size_request {
278 my ($self) = @_; 652 my ($self) = @_;
286sub _draw { 660sub _draw {
287 my ($self) = @_; 661 my ($self) = @_;
288 662
289 my $tex = $self->{texture}; 663 my $tex = $self->{texture};
290 664
291 $self->{x}--;
292
293 glEnable GL_BLEND; 665 glEnable GL_BLEND;
294 glEnable GL_TEXTURE_2D; 666 glEnable GL_TEXTURE_2D;
667 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
296 glBindTexture GL_TEXTURE_2D, $tex->{name}; 669 glBindTexture GL_TEXTURE_2D, $tex->{name};
297 670
298 glColor 1, 1, 1; 671 glColor 1, 0, 0, 1; # TODO color
299 672
300 glBegin GL_QUADS; 673 glBegin GL_QUADS;
301 glTexCoord 0, 0; glVertex 0 , 0; 674 glTexCoord 0, 0; glVertex 0 , 0;
302 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 675 glTexCoord 0, 1; glVertex 0 , $tex->{height};
303 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 676 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
306 679
307 glDisable GL_BLEND; 680 glDisable GL_BLEND;
308 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
309} 682}
310 683
684#############################################################################
685
311package Crossfire::Client::Widget::TextView; 686package Crossfire::Client::Widget::TextEntry;
687
688our @ISA = Crossfire::Client::Widget::Label::;
689
690use SDL;
691use SDL::OpenGL;
692
693sub key_down {
694 my ($self, $ev) = @_;
695
696 my $mod = $ev->key_mod;
697 my $sym = $ev->key_sym;
698
699 $ev->set_unicode (1);
700 my $uni = $ev->key_unicode;
701
702 my $text = $self->get_text;
703
704 if ($sym == SDLK_BACKSPACE) {
705 substr $text, -1, 1, '';
706
707 } elsif ($uni) {
708 $text .= chr $uni;
709 }
710 $self->set_text ($text);
711}
712
713#############################################################################
714
715package Crossfire::Client::Widget::MapWidget;
312 716
313use strict; 717use strict;
314 718
315our @ISA = qw/Crossfire::Client::Widget/; 719use List::Util qw(min max);
316
317use SDL::OpenGL;
318use SDL::OpenGL::Constants;
319
320sub add_line {
321 my ($self, $line) = @_;
322 push @{$self->{lines}}, $line;
323}
324
325sub _draw {
326 my ($self) = @_;
327
328}
329
330package Crossfire::Client::Widget::MapWidget;
331
332use strict;
333
334our @ISA = qw/Crossfire::Client::Widget/;
335 720
336use SDL; 721use SDL;
337use SDL::OpenGL; 722use SDL::OpenGL;
338use SDL::OpenGL::Constants; 723use SDL::OpenGL::Constants;
339 724
725our @ISA = Crossfire::Client::Widget::;
726
340sub key_down { 727sub key_down {
341 print "MAPKEYDOWN\n"; 728 print "MAPKEYDOWN\n";
342} 729}
343 730
344sub key_up { 731sub key_up {
345} 732}
346 733
734sub size_request {
735
736}
737
738sub size_allocate {
739}
740
347sub _draw { 741sub _draw {
742 my ($self) = @_;
743
744 my $mx = $::CONN->{mapx};
745 my $my = $::CONN->{mapy};
746
747 my $map = $::CONN->{map};
748
749 my ($xofs, $yofs);
750
751 my $sw = 1 + int $::WIDTH / 32;
752 my $sh = 1 + int $::HEIGHT / 32;
753
754 if ($::CONN->{mapw} > $sw) {
755 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
756 } else {
757 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
758 }
759
760 if ($::CONN->{maph} > $sh) {
761 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
762 } else {
763 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
764 }
765
348 glEnable GL_TEXTURE_2D; 766 glEnable GL_TEXTURE_2D;
349 glEnable GL_BLEND; 767 glEnable GL_BLEND;
350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
351 769
352 my $map = $::CONN->{map}; 770 my $sw4 = ($sw + 3) & ~3;
771 my $lighting = "\x00" x ($sw4 * $sh);
353 772
354 for my $x (0 .. $::CONN->{mapw} - 1) { 773 for my $x (0 .. $sw - 1) {
355 for my $y (0 .. $::CONN->{maph} - 1) { 774 for my $y (0 .. $sh - 1) {
356 775
357 my $cell = $map->[$x][$y] 776 my $cell = $map->[$x + $xofs][$y + $yofs]
358 or next; 777 or next;
359 778
360 my $darkness = $cell->[3] * (1 / 255); 779 my $darkness = $cell->[0] * (1 / 255);
361 glColor $darkness, $darkness, $darkness; 780 if ($darkness < 0) {
781 $darkness = 0.15;
782 }
783 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
362 784
363 for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { 785 for my $num (grep $_, @$cell[1,2,3]) {
364 my $tex = $::CONN->{face}[$num]{texture} || next; 786 my $tex = $::CONN->{face}[$num]{texture} || next;
365 787
366 glBindTexture GL_TEXTURE_2D, $tex->{name}; 788 glBindTexture GL_TEXTURE_2D, $tex->{name};
367 789
790 my $w = $tex->{width};
791 my $h = $tex->{height};
792
793 my $px = ($x + 1) * 32 - $w;
794 my $py = ($y + 1) * 32 - $h;
795
368 glBegin GL_QUADS; 796 glBegin GL_QUADS;
369 glTexCoord 0, 0; glVertex $x * 32 , $y * 32; 797 glTexCoord 0, 0; glVertex $px , $py;
370 glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; 798 glTexCoord 0, 1; glVertex $px , $py + $h;
371 glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; 799 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
372 glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; 800 glTexCoord 1, 0; glVertex $px + $w, $py;
373 glEnd; 801 glEnd;
374 } 802 }
375 } 803 }
376 } 804 }
377 805
806# if (1) { # higher quality darkness
807# $lighting =~ s/(.)/$1$1$1/gs;
808# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
809#
810# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
811#
812# $lighting = $pb->get_pixels;
813# $lighting =~ s/(.)../$1/gs;
814# }
815
816 $lighting = new Crossfire::Client::Texture
817 width => $sw4,
818 height => $sh,
819 data => $lighting,
820 internalformat => GL_ALPHA4,
821 format => GL_ALPHA;
822
823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
824 glColor 0, 0, 0, 0.75;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 glBindTexture GL_TEXTURE_2D, $lighting->{name};
827 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828 glBegin GL_QUADS;
829 glTexCoord 0, 0; glVertex 0 , 0;
830 glTexCoord 0, 1; glVertex 0 , $sh * 32;
831 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833 glEnd;
834
378 glDisable GL_TEXTURE_2D; 835 glDisable GL_TEXTURE_2D;
379 glDisable GL_BLEND; 836 glDisable GL_BLEND;
380} 837}
381 838
382my %DIR = ( 839my %DIR = (
383 SDLK_KP8, [1, "north"], 840 SDLK_KP8, [1, "north"],
384 SDLK_KP9, [2, "northest"], 841 SDLK_KP9, [2, "northeast"],
385 SDLK_KP6, [3, "east"], 842 SDLK_KP6, [3, "east"],
386 SDLK_KP3, [4, "southeast"], 843 SDLK_KP3, [4, "southeast"],
387 SDLK_KP2, [5, "south"], 844 SDLK_KP2, [5, "south"],
388 SDLK_KP1, [6, "southwest"], 845 SDLK_KP1, [6, "southwest"],
389 SDLK_KP4, [7, "west"], 846 SDLK_KP4, [7, "west"],
390 SDLK_KP7, [8, "northwest"], 847 SDLK_KP7, [8, "northwest"],
848
849 SDLK_UP, [1, "north"],
850 SDLK_RIGHT, [3, "east"],
851 SDLK_DOWN, [5, "south"],
852 SDLK_LEFT, [7, "west"],
391); 853);
392 854
393sub key_down { 855sub key_down {
394 my ($self, $ev) = @_; 856 my ($self, $ev) = @_;
395 857
398 860
399 if ($sym == SDLK_KP5) { 861 if ($sym == SDLK_KP5) {
400 $::CONN->send ("command stay fire"); 862 $::CONN->send ("command stay fire");
401 } elsif (exists $DIR{$sym}) { 863 } elsif (exists $DIR{$sym}) {
402 if ($mod & KMOD_SHIFT) { 864 if ($mod & KMOD_SHIFT) {
865 $self->{shft}++;
403 $::CONN->send ("command fire $DIR{$sym}[0]"); 866 $::CONN->send ("command fire $DIR{$sym}[0]");
404 } elsif ($mod & KMOD_CTRL) { 867 } elsif ($mod & KMOD_CTRL) {
868 $self->{ctrl}++;
405 $::CONN->send ("command run $DIR{$sym}[0]"); 869 $::CONN->send ("command run $DIR{$sym}[0]");
406 } else { 870 } else {
871 $::CONN->send ("command $DIR{$sym}[1]");
407 } 872 }
408 } 873 }
409} 874}
410 875
411sub key_up { 876sub key_up {
412 my ($self, $ev) = @_; 877 my ($self, $ev) = @_;
413 878
414 my $mod = $ev->key_mod; 879 my $mod = $ev->key_mod;
415 my $sym = $ev->key_sym; 880 my $sym = $ev->key_sym;
416 881
417 if (exists $DIR{$sym}) { 882 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
418 if ($mod & KMOD_SHIFT) {
419 $::CONN->send ("command fire_stop"); 883 $::CONN->send ("command fire_stop");
420 } else { 884 }
885 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->send ("command run_stop"); 886 $::CONN->send ("command run_stop");
887 }
888}
889
890#############################################################################
891
892package Crossfire::Client::Widget::Animator;
893
894use SDL::OpenGL;
895
896our @ISA = Crossfire::Client::Widget::Bin::;
897
898sub moveto {
899 my ($self, $x, $y) = @_;
900
901 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902 $self->{speed} = 0.2;
903 $self->{time} = 1;
904
905 ::animation_start $self;
906}
907
908sub animate {
909 my ($self, $interval) = @_;
910
911 $self->{time} -= $interval * $self->{speed};
912 if ($self->{time} <= 0) {
913 $self->{time} = 0;
914 ::animation_stop $self;
915 }
916
917 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
422 } 918
423 } 919 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
920 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
921}
922
923sub _draw {
924 my ($self) = @_;
925
926 glPushMatrix;
927 glRotate $self->{time} * 10000, 0, 1, 0;
928 $self->{children}[0]->draw;
929 glPopMatrix;
424} 930}
425 931
4261; 9321;
427 933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines