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

Diff Legend

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