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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines