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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines