ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC

148 glPushMatrix; 148 glPushMatrix;
149 glCallList $self->{list}; 149 glCallList $self->{list};
150 glPopMatrix; 150 glPopMatrix;
151 151
152 # TNT2 emulates logops in software (or worse :) 152 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS != $self) { 153 if ($CFClient::UI::FOCUS == $self) {
154 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus};
156 } else {
154 glColor 0.4, 0.2, 0.2, 0.9; 157 glColor 0.4, 0.2, 0.2, 0.6;
155 glEnable GL_BLEND; 158 glEnable GL_BLEND;
156 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157 glBegin GL_QUADS; 160 glBegin GL_QUADS;
158 glVertex 0, 0; 161 glVertex 0, 0;
159 glVertex 0, $::HEIGHT; 162 glVertex 0, $::HEIGHT;
160 glVertex $::WIDTH, $::HEIGHT; 163 glVertex $::WIDTH, $::HEIGHT;
161 glVertex $::WIDTH, 0; 164 glVertex $::WIDTH, 0;
162 glEnd; 165 glEnd;
163 glDisable GL_BLEND; 166 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
164 } 188 }
165} 189}
166 190
167my %DIR = ( 191my %DIR = (
168 CFClient::SDLK_KP8, [1, "north"], 192 CFClient::SDLK_KP8, [1, "north"],
456 480
457 @match = map $self->{command}{$_->[0]}, 481 @match = map $self->{command}{$_->[0]},
458 sort { 482 sort {
459 $a->[1] <=> $b->[1] 483 $a->[1] <=> $b->[1]
460 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0])
461 } @match; 486 } @match;
462 487
463 $self->{last_search} = $cmd; 488 $self->{last_search} = $cmd;
464 $self->{last_match} = \@match; 489 $self->{last_match} = \@match;
465 490

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines