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.30 by root, Sun Apr 9 00:18:45 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

… …
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 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);
50} 44}
51 45
52sub focus_in { 46sub focus_in {
53 my ($widget) = @_; 47 my ($widget) = @_;
54 $FOCUS = $widget; 48 $FOCUS = $widget;
… …
72 66
73sub button_up { 67sub button_up {
74 my ($widget, $sdlev) = @_; 68 my ($widget, $sdlev) = @_;
75} 69}
76 70
77sub w { $_[0]->{w} } 71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 76
83sub draw { 77sub draw {
… …
88 $self->_draw; 82 $self->_draw;
89 glPopMatrix; 83 glPopMatrix;
90} 84}
91 85
92sub _draw { 86sub _draw {
93 my ($widget) = @_; 87 my ($self) = @_;
88
89 warn "no draw defined for $self\n";
94} 90}
95 91
96sub bbox { 92sub bbox {
97 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};
98} 131}
99 132
100sub DESTROY { 133sub DESTROY {
101 my ($self) = @_; 134 my ($self) = @_;
102 135
103 $self->deactivate; 136 #$self->deactivate;
104} 137}
105 138
106package Crossfire::Client::Widget::Container; 139package Crossfire::Client::Widget::Container;
107 140
108our @ISA = Crossfire::Client::Widget::; 141our @ISA = Crossfire::Client::Widget::;
109 142
110use SDL::OpenGL; 143sub new {
144 my ($class, @widgets) = @_;
111 145
112sub add { $_[0]->{child} = $_[1] } 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
113sub get { $_[0]->{child} } 209sub get { $_[0]->{children}[0] }
114 210
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 211sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0];
213}
116 214
117sub _draw { die "Containers can't be drawn!" } 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}
118 231
119package Crossfire::Client::Widget::Window; 232package Crossfire::Client::Widget::Window;
120 233
121our @ISA = Crossfire::Client::Widget::Container::; 234our @ISA = Crossfire::Client::Widget::Bin::;
122 235
123use SDL::OpenGL; 236use SDL::OpenGL;
124 237
125sub add { 238sub add {
126 my ($self, $chld) = @_; 239 my ($self, $chld) = @_;
240 warn "ADD $chld\n";
127 $self->SUPER::add ($chld); 241 $self->SUPER::add ($chld);
128 $self->render_chld; #TODO: Move this to the size_request event propably? 242 $chld->set_parent ($self);
243}
244
245sub remove {
246 my ($self) = @_;
247 # TODO FIXME: removing a child from a window will crash, see render_chld
248 # $self->update;
249}
250
251sub update {
252 my ($self) = @_;
253 $self->render_chld;
129} 254}
130 255
131sub render_chld { 256sub render_chld {
132 my ($self) = @_; 257 my ($self) = @_;
133 my $chld = $self->get; 258 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 259 my ($w, $h) = $self->size_request;
135 260
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
136 $self->{texture} = 264 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 266 $w, $h, sub { $chld->draw }
139 ); 267 );
140 $self->{texture}->upload; 268 $self->{texture}->upload;
141} 269}
142 270
143sub size_request { 271sub size_request {
144 my ($self) = @_; 272 my ($self) = @_;
145 my $chld = $self->get 273 ($self->w, $self->h)
146 or return (0, 0); 274}
147 $chld->size_request 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?
148} 284}
149 285
150sub _draw { 286sub _draw {
151 my ($self) = @_; 287 my ($self) = @_;
152 288
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 289 my ($w, $h) = ($self->w, $self->h);
154 290
155 my $tex = $self->{texture} 291 my $tex = $self->{texture}
156 or return; 292 or return;
157 293
158 glEnable GL_BLEND; 294 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 295 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name}; 297 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 1, 1;
164 298
165 glBegin GL_QUADS; 299 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0; 300 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h; 301 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h; 302 glTexCoord 1, 1; glVertex $w, $h;
… …
173 glDisable GL_TEXTURE_2D; 307 glDisable GL_TEXTURE_2D;
174} 308}
175 309
176package Crossfire::Client::Widget::Frame; 310package Crossfire::Client::Widget::Frame;
177 311
178our @ISA = Crossfire::Client::Widget::Container::; 312our @ISA = Crossfire::Client::Widget::Bin::;
179 313
180use SDL::OpenGL; 314use SDL::OpenGL;
181 315
182sub size_request { 316sub size_request {
183 my ($self) = @_; 317 my ($self) = @_;
… …
185 or return (0, 0); 319 or return (0, 0);
186 320
187 $chld->move (2, 2); 321 $chld->move (2, 2);
188 322
189 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
324}
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);
190} 334}
191 335
192sub _draw { 336sub _draw {
193 my ($self) = @_; 337 my ($self) = @_;
194 338
… …
205 glEnd; 349 glEnd;
206 350
207 $chld->draw; 351 $chld->draw;
208} 352}
209 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
472}
473
210package Crossfire::Client::Widget::Table; 474package Crossfire::Client::Widget::Table;
211 475
212our @ISA = Crossfire::Client::Widget::Container::; 476our @ISA = Crossfire::Client::Widget::Bin::;
213 477
214use SDL::OpenGL; 478use SDL::OpenGL;
215 479
216sub add { 480sub add {
217 my ($self, $x, $y, $chld) = @_; 481 my ($self, $x, $y, $chld) = @_;
482 my $old_chld = $self->{children}[$y][$x];
483
218 $self->{childs}[$y][$x] = $chld; 484 $self->{children}[$y][$x] = $chld;
485 $chld->set_parent ($self);
486 $self->update;
219} 487}
220 488
221sub max_row_height { 489sub max_row_height {
222 my ($self, $row) = @_; 490 my ($self, $row) = @_;
223 491
224 my $hs = 0; 492 my $hs = 0;
225 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 493 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
226 my $c = $self->{childs}->[$row]->[$xi]; 494 my $c = $self->{children}->[$row]->[$xi];
227 if ($c) { 495 if ($c) {
228 my ($w, $h) = $c->size_request; 496 my ($w, $h) = $c->size_request;
229 if ($hs < $h) { $hs = $h } 497 if ($hs < $h) { $hs = $h }
230 } 498 }
231 } 499 }
… …
234 502
235sub max_col_width { 503sub max_col_width {
236 my ($self, $col) = @_; 504 my ($self, $col) = @_;
237 505
238 my $ws = 0; 506 my $ws = 0;
239 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 507 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
240 my $c = ($self->{childs}->[$yi] || [])->[$col]; 508 my $c = ($self->{children}->[$yi] || [])->[$col];
241 if ($c) { 509 if ($c) {
242 my ($w, $h) = $c->size_request; 510 my ($w, $h) = $c->size_request;
243 if ($ws < $w) { $ws = $w } 511 if ($ws < $w) { $ws = $w }
244 } 512 }
245 } 513 }
… …
249sub size_request { 517sub size_request {
250 my ($self) = @_; 518 my ($self) = @_;
251 519
252 my ($hs, $ws) = (0, 0); 520 my ($hs, $ws) = (0, 0);
253 521
254 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 522 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
255 $hs += $self->max_row_height ($yi); 523 $hs += $self->max_row_height ($yi);
256 } 524 }
257 525
258 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 526 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
259 my $wm = 0; 527 my $wm = 0;
260 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 528 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
261 $wm += $self->max_col_width ($xi) 529 $wm += $self->max_col_width ($xi)
262 } 530 }
263 if ($ws < $wm) { $ws = $wm } 531 if ($ws < $wm) { $ws = $wm }
264 } 532 }
265 533
… …
268 536
269sub _draw { 537sub _draw {
270 my ($self) = @_; 538 my ($self) = @_;
271 539
272 my $y = 0; 540 my $y = 0;
273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 541 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
274 my $x = 0; 542 my $x = 0;
275 543
276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
277 545
278 my $c = $self->{childs}->[$yi]->[$xi]; 546 my $c = $self->{children}->[$yi]->[$xi];
279 if ($c) { 547 if ($c) {
280 $c->move ($x, $y, 0); #TODO: Move to size_request 548 $c->move ($x, $y, 0); #TODO: Move to size_request
281 $c->draw if $c; 549 $c->draw if $c;
282 } 550 }
283 551
… …
292 560
293our @ISA = Crossfire::Client::Widget::Container::; 561our @ISA = Crossfire::Client::Widget::Container::;
294 562
295use SDL::OpenGL; 563use SDL::OpenGL;
296 564
297sub add { 565sub size_allocate {
298 my ($self, $chld) = @_; 566 my ($self, $w, $h) = @_;
299 push @{$self->{childs}}, $chld;
300}
301 567
302sub size_request { 568 $self->w ($w);
303 my ($self) = @_; 569 $self->h ($h);
304 570
305 my ($hs, $ws) = (0, 0); 571 my $exp;
572 my @oth;
573 # find expand widget
306 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) {
307 my ($w, $h) = $_->size_request; 586 my ($w, $h) = $_->size_request;
308 $hs += $h; 587 $oh += $h;
309 if ($ws < $w) { $ws = $w } 588 if ($ow < $w) { $ow = $w }
310 } 589 }
311 590
312 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 }
313} 604}
314 605
315sub _draw { 606sub _draw {
316 my ($self) = @_; 607 my ($self) = @_;
317 608
318 my ($x, $y); 609 my ($x, $y);
319 for (@{$self->{childs} || []}) { 610 for (@{$self->{children} || []}) {
320 $_->move (0, $y, 0); #TODO: move to size_request
321 $_->draw; 611 $_->draw;
322 my ($w, $h) = $_->size_request;
323 $y += $h; 612 $y += $_->h;
324 } 613 }
325} 614}
326 615
327package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
328 617
… …
331use SDL::OpenGL; 620use SDL::OpenGL;
332 621
333sub new { 622sub new {
334 my ($class, $x, $y, $z, $height, $text) = @_; 623 my ($class, $x, $y, $z, $height, $text) = @_;
335 624
625 # TODO: color, and make height, xyz etc. optional
336 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
337 627
338 $self->set_text ($text); 628 $self->set_text ($text);
339 629
340 $self 630 $self
… …
342 632
343sub set_text { 633sub set_text {
344 my ($self, $text) = @_; 634 my ($self, $text) = @_;
345 635
346 $self->{text} = $text; 636 $self->{text} = $text;
347
348 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
638
639 $self->update;
349} 640}
350 641
351sub get_text { 642sub get_text {
352 my ($self, $text) = @_; 643 my ($self, $text) = @_;
353 644
… …
372 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
376 667
377 glColor 1, 1, 1, 0.8; 668 glColor 1, 0, 0, 1; # TODO color
378 669
379 glBegin GL_QUADS; 670 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
381 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
385 676
386 glDisable GL_BLEND; 677 glDisable GL_BLEND;
387 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
388} 679}
389 680
390package Crossfire::Client::Widget::TextView; 681package Crossfire::Client::Widget::TextEntry;
391 682
392use strict;
393
394our @ISA = qw/Crossfire::Client::Widget/; 683our @ISA = Crossfire::Client::Widget::Label::;
395 684
685use SDL;
396use SDL::OpenGL; 686use SDL::OpenGL;
397use SDL::OpenGL::Constants;
398 687
399sub add_line { 688sub key_down {
400 my ($self, $line) = @_; 689 my ($self, $ev) = @_;
401 push @{$self->{lines}}, $line;
402}
403 690
404sub _draw { 691 my $mod = $ev->key_mod;
405 my ($self) = @_; 692 my $sym = $ev->key_sym;
406 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);
407} 706}
408 707
409package Crossfire::Client::Widget::MapWidget; 708package Crossfire::Client::Widget::MapWidget;
410 709
411use strict; 710use strict;
… …
421sub key_down { 720sub key_down {
422 print "MAPKEYDOWN\n"; 721 print "MAPKEYDOWN\n";
423} 722}
424 723
425sub key_up { 724sub key_up {
725}
726
727sub size_request {
728
729}
730
731sub size_allocate {
426} 732}
427 733
428sub _draw { 734sub _draw {
429 my ($self) = @_; 735 my ($self) = @_;
430 736
… …
450 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 756 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451 } 757 }
452 758
453 glEnable GL_TEXTURE_2D; 759 glEnable GL_TEXTURE_2D;
454 glEnable GL_BLEND; 760 glEnable GL_BLEND;
455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762
763 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh);
456 765
457 for my $x (0 .. $sw - 1) { 766 for my $x (0 .. $sw - 1) {
458 for my $y (0 .. $sh - 1) { 767 for my $y (0 .. $sh - 1) {
459 768
460 my $cell = $map->[$x + $xofs][$y + $yofs] 769 my $cell = $map->[$x + $xofs][$y + $yofs]
461 or next; 770 or next;
462 771
463 my $darkness = $cell->[0] * (1 / 255); 772 my $darkness = $cell->[0] * (1 / 255);
464 if ($darkness < 0) { 773 if ($darkness < 0) {
465 glColor 0.3, 0.3, 0.3; 774 $darkness = 0.15;
466 } else {
467 glColor $darkness, $darkness, $darkness;
468 } 775 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
469 777
470 for my $num (grep $_, @$cell[1,2,3]) { 778 for my $num (grep $_, @$cell[1,2,3]) {
471 my $tex = $::CONN->{face}[$num]{texture} || next; 779 my $tex = $::CONN->{face}[$num]{texture} || next;
472 780
473 glBindTexture GL_TEXTURE_2D, $tex->{name}; 781 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
485 glTexCoord 1, 0; glVertex $px + $w, $py; 793 glTexCoord 1, 0; glVertex $px + $w, $py;
486 glEnd; 794 glEnd;
487 } 795 }
488 } 796 }
489 } 797 }
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;
490 827
491 glDisable GL_TEXTURE_2D; 828 glDisable GL_TEXTURE_2D;
492 glDisable GL_BLEND; 829 glDisable GL_BLEND;
493} 830}
494 831
… …
541 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
542 $::CONN->send ("command run_stop"); 879 $::CONN->send ("command run_stop");
543 } 880 }
544} 881}
545 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}};
909
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;
921}
922
5461; 9231;
547 924

Diff Legend

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